Skip to content

Commit f3dba7e

Browse files
committed
[skip ci ] Rename matrix-include output on old branches
Otherwise we have a discrepancy of the output name between master:nightly.yml and branch:nightly_matrix.php.
1 parent d16b5d3 commit f3dba7e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/nightly_matrix.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function get_branches() {
4242
return get_branch_matrix($changed_branches);
4343
}
4444

45-
function get_asan_matrix(array $branches) {
45+
function get_matrix_include(array $branches) {
4646
$jobs = [];
4747
foreach ($branches as $branch) {
4848
$jobs[] = [
@@ -65,7 +65,7 @@ function get_asan_matrix(array $branches) {
6565
}
6666

6767
$branches = get_branches();
68-
$asan_matrix = get_asan_matrix($branches);
68+
$matrix_include = get_matrix_include($branches);
6969

7070
echo '::set-output name=branches::' . json_encode($branches, JSON_UNESCAPED_SLASHES) . "\n";
71-
echo '::set-output name=asan-matrix::' . json_encode($asan_matrix, JSON_UNESCAPED_SLASHES) . "\n";
71+
echo '::set-output name=matrix-include::' . json_encode($matrix_include, JSON_UNESCAPED_SLASHES) . "\n";

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
outputs:
1212
branches: ${{ steps.set-matrix.outputs.branches }}
13-
asan-matrix: ${{ steps.set-matrix.outputs.asan-matrix }}
13+
matrix-include: ${{ steps.set-matrix.outputs.matrix-include }}
1414
steps:
1515
- uses: actions/checkout@v2
1616
with:
@@ -39,7 +39,7 @@ jobs:
3939
branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
4040
debug: [true, false]
4141
zts: [true, false]
42-
include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.asan-matrix) }}
42+
include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
4343
name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
4444
runs-on: ubuntu-20.04
4545
steps:

0 commit comments

Comments
 (0)