[PHP] Move os matrix build to php

magenius-team · Jan 29, 2025 · 55198b0 · 55198b0
1 parent 57fe130
commit 55198b0
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 107 deletions.
diff --git a/.github/workflows/docker-image-php-fpm.yml b/.github/workflows/docker-image-php-fpm.yml
@@ -17,7 +17,7 @@ jobs:
     container:
       image: php:8.4-cli-alpine
     outputs:
-      include: ${{ steps.matrix.outputs.include }}
+      matrix: ${{ steps.matrix.outputs.matrix }}
     env:
       PHP_LATEST: ${{ vars.PHP_LATEST }}
       PHP_VERSIONS: ${{ vars.PHP_VERSIONS }}
@@ -29,15 +29,15 @@ jobs:
       - id: matrix
         run: |
           php .github/workflows/php-matrix/php-generator.php >> $GITHUB_OUTPUT
-      - run: echo "Matrix:\n";echo '${{ steps.matrix.outputs.include }}'
+      - run: echo "Matrix:\n";echo '${{ steps.matrix.outputs.matrix }}'
 
   node-matrix:
     name: Generate Base PHP-Node Matrix
     runs-on: ubuntu-latest
     container:
       image: php:8.4-cli-alpine
     outputs:
-      include: ${{ steps.matrix.outputs.include }}
+      matrix: ${{ steps.matrix.outputs.matrix }}
     env:
       PHP_LATEST: ${{ vars.PHP_LATEST }}
       PHP_VERSIONS: ${{ vars.PHP_VERSIONS }}
@@ -49,15 +49,15 @@ jobs:
       - id: matrix
         run: |
           php .github/workflows/php-matrix/node-generator.php >> $GITHUB_OUTPUT
-      - run: echo "Matrix:\n";echo '${{ steps.matrix.outputs.include }}'
+      - run: echo "Matrix:\n";echo '${{ steps.matrix.outputs.matrix }}'
 
   full-matrix:
     name: Generate Full Matrix
     runs-on: ubuntu-latest
     container:
       image: php:8.4-cli-alpine
     outputs:
-      include: ${{ steps.matrix.outputs.include }}
+      matrix: ${{ steps.matrix.outputs.matrix }}
     env:
       PHP_LATEST: ${{ vars.PHP_LATEST }}
       PHP_VERSIONS: ${{ vars.PHP_VERSIONS }}
@@ -69,7 +69,7 @@ jobs:
       - id: matrix
         run: |
           php .github/workflows/php-matrix/full-generator.php >> $GITHUB_OUTPUT
-      - run: echo "Matrix:\n";echo '${{ steps.matrix.outputs.include }}'
+      - run: echo "Matrix:\n";echo '${{ steps.matrix.outputs.matrix }}'
 
   php-fpm:
     needs: php-matrix
@@ -78,9 +78,7 @@ jobs:
     continue-on-error: false
     strategy:
       fail-fast: false
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.php-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.php-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -121,9 +119,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 6 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.node-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.node-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -163,9 +159,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -206,9 +200,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -249,9 +241,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -291,9 +281,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -333,9 +321,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -375,9 +361,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -417,9 +401,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -459,9 +441,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -501,9 +481,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -544,9 +522,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -587,9 +563,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -629,9 +603,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -671,9 +643,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -713,9 +683,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -755,9 +723,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -797,9 +763,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -839,9 +803,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.include) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -882,9 +844,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.include) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -925,9 +885,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.include) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -967,9 +925,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.include) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -1009,9 +965,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.include) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
@@ -1051,9 +1005,7 @@ jobs:
     strategy:
       fail-fast: false
       max-parallel: ${{ github.ref == 'refs/heads/main' && 2 || 0 }}
-      matrix:
-        os: ${{ fromJson(vars.RUN_ON_OS) }}
-        include: ${{ fromJson(needs.full-matrix.outputs.include) }}
+      matrix: ${{ fromJson(needs.full-matrix.outputs.include) }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3

diff --git a/.github/workflows/php-matrix/constants.php b/.github/workflows/php-matrix/constants.php
@@ -1,5 +1,6 @@
 <?php
 
+$osVersions = explode(',', getenv('RUN_ON_OS'));
 $phpLatest = getenv('PHP_LATEST');
 $phpVersions = explode(',', getenv('PHP_VERSIONS'));
 $nodeLatest = getenv('NODE_LATEST');

diff --git a/.github/workflows/php-matrix/full-generator.php b/.github/workflows/php-matrix/full-generator.php
@@ -2,25 +2,29 @@
 
 include(__DIR__ . DIRECTORY_SEPARATOR . 'constants.php');
 
-global $phpLatest, $phpVersions, $nodeLatest, $nodeVersions, $notStableXdebugPhpVersions;
+global $osVersions, $phpLatest, $phpVersions, $nodeLatest, $nodeVersions, $notStableXdebugPhpVersions;
 $matrix = [];
 
-foreach ($phpVersions as $phpVersion) {
-    $xdebugType = !in_array($phpVersion, $notStableXdebugPhpVersions) ? 'xdebug-stable' : 'xdebug';
-    $matrix[] = [
-        'php_version' => $phpVersion,
-        'node_version' => 'x',
-        'xdebug_type' => $xdebugType,
-        'latest' => $phpVersion === $phpLatest,
-    ];
-    foreach ($nodeVersions as $nodeVersion) {
+foreach ($osVersions as $osVersion) {
+    foreach ($phpVersions as $phpVersion) {
+        $xdebugType = !in_array($phpVersion, $notStableXdebugPhpVersions) ? 'xdebug-stable' : 'xdebug';
         $matrix[] = [
+            'os' => $osVersion,
             'php_version' => $phpVersion,
-            'node_version' => $nodeVersion,
+            'node_version' => 'x',
             'xdebug_type' => $xdebugType,
-            'latest' => $phpVersion === $phpLatest && $nodeVersion === $nodeLatest,
+            'latest' => $phpVersion === $phpLatest,
         ];
+        foreach ($nodeVersions as $nodeVersion) {
+            $matrix[] = [
+                'os' => $osVersion,
+                'php_version' => $phpVersion,
+                'node_version' => $nodeVersion,
+                'xdebug_type' => $xdebugType,
+                'latest' => $phpVersion === $phpLatest && $nodeVersion === $nodeLatest,
+            ];
+        }
     }
 }
 
-echo 'include=' . json_encode($matrix);
+echo 'matrix=' . json_encode(['include' => $matrix]);
diff --git a/.github/workflows/php-matrix/node-generator.php b/.github/workflows/php-matrix/node-generator.php
@@ -2,17 +2,20 @@
 
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'constants.php');
 
-global $phpLatest, $phpVersions, $nodeLatest, $nodeVersions;
+global $osVersions, $phpLatest, $phpVersions, $nodeLatest, $nodeVersions;
 $matrix = [];
 
-foreach ($phpVersions as $phpVersion) {
-    foreach ($nodeVersions as $nodeVersion) {
-        $matrix[] = [
-            'php_version' => $phpVersion,
-            'node_version' => $nodeVersion,
-            'latest' => $phpVersion === $phpLatest && $nodeVersion === $nodeLatest,
-        ];
+foreach ($osVersions as $osVersion) {
+    foreach ($phpVersions as $phpVersion) {
+        foreach ($nodeVersions as $nodeVersion) {
+            $matrix[] = [
+                'os' => $osVersion,
+                'php_version' => $phpVersion,
+                'node_version' => $nodeVersion,
+                'latest' => $phpVersion === $phpLatest && $nodeVersion === $nodeLatest,
+            ];
+        }
     }
 }
 
-echo 'include=' . json_encode($matrix);
+echo 'matrix=' . json_encode(['include' => $matrix]);