Skip to content

Commit

Permalink
[skip ci ] Rename matrix-include output on old branches
Browse files Browse the repository at this point in the history
Otherwise we have a discrepancy of the output name between
master:nightly.yml and branch:nightly_matrix.php.
  • Loading branch information
iluuu1994 committed Sep 29, 2022
1 parent d16b5d3 commit f3dba7e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/nightly_matrix.php
Expand Up @@ -42,7 +42,7 @@ function get_branches() {
return get_branch_matrix($changed_branches);
}

function get_asan_matrix(array $branches) {
function get_matrix_include(array $branches) {
$jobs = [];
foreach ($branches as $branch) {
$jobs[] = [
Expand All @@ -65,7 +65,7 @@ function get_asan_matrix(array $branches) {
}

$branches = get_branches();
$asan_matrix = get_asan_matrix($branches);
$matrix_include = get_matrix_include($branches);

echo '::set-output name=branches::' . json_encode($branches, JSON_UNESCAPED_SLASHES) . "\n";
echo '::set-output name=asan-matrix::' . json_encode($asan_matrix, JSON_UNESCAPED_SLASHES) . "\n";
echo '::set-output name=matrix-include::' . json_encode($matrix_include, JSON_UNESCAPED_SLASHES) . "\n";
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
outputs:
branches: ${{ steps.set-matrix.outputs.branches }}
asan-matrix: ${{ steps.set-matrix.outputs.asan-matrix }}
matrix-include: ${{ steps.set-matrix.outputs.matrix-include }}
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -39,7 +39,7 @@ jobs:
branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
debug: [true, false]
zts: [true, false]
include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.asan-matrix) }}
include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
runs-on: ubuntu-20.04
steps:
Expand Down

0 comments on commit f3dba7e

Please sign in to comment.