wip

Author: iluuu1994

.github/nightly_matrix.php

@@ -73,11 +73,11 @@ function get_branch_matrix($branches) {
         $branch_key = strtoupper(str_replace('.', '', $branch));
         return [
             'name' => $branch_key,
-            'branch' => $branch,
+            'ref' => $branch,
         ];
     }, $branches);
 
-    return ['branches' => $result];
+    return ['branch' => $result];
 }
 
 $branches = get_branches();

.github/workflows/nightly.yml

@@ -65,20 +65,20 @@ jobs:
   #         extended: ${{ inputs.extendedTests }}
   #         runTestsParameters: ${{ inputs.runTestsParameters }}
   debug_zts_msan:
-    needs: generate_matrix
-    strategy:
-      matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
-      fail-fast: false
-    name: ${{ matrix.name }}
+    # needs: generate_matrix
+    # strategy:
+    #   matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
+    #   fail-fast: false
+    # name: ${{ matrix.branch.name }}
     runs-on: ubuntu-20.04
     env:
-      arch: linux-x64
+      ARCH: linux-x64
     steps:
       - name: git checkout
         uses: actions/checkout@v2
         # Only test on current branch until merged
         # with:
-        #   ref: ${{ matrix.branch }}
+        #   ref: ${{ matrix.branch.ref }}
       - name: Install dependencies
         uses: ./.github/actions/deps
       - name: ./configure
@@ -143,20 +143,20 @@ jobs:
           extended: false
           runTestsParameters: '--msan'
   community:
-    needs: generate_matrix
-    strategy:
-      matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
-      fail-fast: false
-    name: ${{ matrix.name }}
+    # needs: generate_matrix
+    # strategy:
+    #   matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
+    #   fail-fast: false
+    # name: ${{ matrix.branch.name }}
     runs-on: ubuntu-20.04
     env:
-      arch: linux-x64
+      ARCH: linux-x64
     steps:
       - name: git checkout
         uses: actions/checkout@v2
         # Only test on current branch until merged
         # with:
-        #   ref: ${{ matrix.branch }}
+        #   ref: ${{ matrix.branch.ref }}
       - name: Install dependencies
         uses: ./.github/actions/deps
       - name: ./configure
@@ -253,20 +253,20 @@ jobs:
           sed -i 's/PHP_SAPI/"cli-server"/g' var/cache/dev/App_KernelDevDebugContainer.preload.php
           php -d opcache.preload=var/cache/dev/App_KernelDevDebugContainer.preload.php public/index.php
   coverage:
-    needs: generate_matrix
-    strategy:
-      matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
-      fail-fast: false
-    name: ${{ matrix.name }}
+    # needs: generate_matrix
+    # strategy:
+    #   matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
+    #   fail-fast: false
+    # name: ${{ matrix.branch.name }}
     runs-on: ubuntu-20.04
     env:
-      arch: linux-x64
+      ARCH: linux-x64
     steps:
       - name: git checkout
         uses: actions/checkout@v2
         # Only test on current branch until merged
         # with:
-        #   ref: ${{ matrix.branch }}
+        #   ref: ${{ matrix.branch.ref }}
       - name: Create mssql container
         uses: ./.github/actions/mssql
       - name: Install dependencies
@@ -303,20 +303,20 @@ jobs:
       #     codeCoverageTool: 'Cobertura'
       #     summaryFileLocation: coverage.xml
   opcache_variation:
-    needs: generate_matrix
-    strategy:
-      matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
-      fail-fast: false
-    name: ${{ matrix.name }}
+    # needs: generate_matrix
+    # strategy:
+    #   matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
+    #   fail-fast: false
+    # name: ${{ matrix.branch.name }}
     runs-on: ubuntu-20.04
     env:
-      arch: linux-x64
+      ARCH: linux-x64
     steps:
       - name: git checkout
         uses: actions/checkout@v2
         # Only test on current branch until merged
         # with:
-        #   ref: ${{ matrix.branch }}
+        #   ref: ${{ matrix.branch.ref }}
       - name: Create mssql container
         uses: ./.github/actions/mssql
       - name: Install dependencies
@@ -368,20 +368,20 @@ jobs:
         with:
           runTestsParameters: -d zend_extension=opcache.so --preload
   libmysqlclient_debug_nts:
-    needs: generate_matrix
-    strategy:
-      matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
-      fail-fast: false
-    name: ${{ matrix.name }}
+    # needs: generate_matrix
+    # strategy:
+    #   matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
+    #   fail-fast: false
+    # name: ${{ matrix.branch.name }}
     runs-on: ubuntu-20.04
     env:
-      arch: linux-x64
+      ARCH: linux-x64
     steps:
       - name: git checkout
         uses: actions/checkout@v2
         # Only test on current branch until merged
         # with:
-        #   ref: ${{ matrix.branch }}
+        #   ref: ${{ matrix.branch.ref }}
       - name: Install dependencies
         run: |
           sudo apt-get update -y | true