Use GITHUB_RUN_ID

shopware · Jan 29, 2024 · 97db9e7 · 97db9e7
1 parent f4d25b8
commit 97db9e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Generate Matrix
         id: generate-matrix
         run: |
-          MATRIX=$(GH_JOB_ID=${{ github.job }} php matrix.php)
+          MATRIX=$(php matrix.php)
           echo "matrix<<EOF" >> $GITHUB_OUTPUT
           echo "$MATRIX" >> $GITHUB_OUTPUT
           echo 'EOF' >> $GITHUB_OUTPUT

diff --git a/matrix.php b/matrix.php
@@ -39,7 +39,7 @@
 
     $phpDigest = get_digest_of_image('library/php', $patchVersion['version'] . '-fpm-alpine');
 
-    $imagePrefix = $_ENV['GH_JOB_ID'] ? ($_ENV['GH_JOB_ID'] . '_') : '';
+    $imagePrefix = $_SERVER['GITHUB_RUN_ID'] ? ($_SERVER['GITHUB_RUN_ID'] . '-') : '';
 
     $data[] = [
         'php' => $supportedVersion,