From f3dba7e6425092f996c9a79df16d4d6e0aa63c1e Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Thu, 29 Sep 2022 13:02:13 +0200
Subject: [PATCH] [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.
---
 .github/nightly_matrix.php    | 6 +++---
 .github/workflows/nightly.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/nightly_matrix.php b/.github/nightly_matrix.php
index a099a3ba2ad..f37be33fc68 100644
--- a/.github/nightly_matrix.php
+++ b/.github/nightly_matrix.php
@@ -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[] = [
@@ -65,7 +65,7 @@ if ($discard_cache) {
 }
 
 $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";
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index e4d35a6354e..bf353b32220 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -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:
@@ -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: