build.yml: Use job outputs to assemble PR comment

sigrokproject · Aug 27, 2024 · c194964 · c194964
1 parent 28f00cc
commit c194964
Showing 1 changed file with 38 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -61,6 +61,9 @@ jobs:
       WGET: "wget -c --quiet --no-check-certificate"
       ARTIFACT_VERSION: "NIGHTLY"
 
+    outputs:
+      pr-links: ${{ steps.pr_links.outputs.PR_LINKS }}
+
     steps:
       - name: Set artifact version to PR
         if: (github.event_name == 'pull_request')
@@ -134,10 +137,11 @@ jobs:
           path: pulseview/build/contrib/pulseview*installer.exe
 
       - name: Add artifact to pull request message
+        id: pr_links
         # Only relevant for pull requests
         if: (github.event_name == 'pull_request')
         run: |
-          echo "PR_LINKS=$PR_LINKS | pulseview-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-${{ matrix.build_type.name }}-installer.exe | ${{ steps.upload.outputs.artifact-url }}" >> $GITHUB_ENV
+          echo "PR_LINKS=$PR_LINKS | pulseview-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-${{ matrix.build_type.name }}-installer.exe | ${{ steps.upload.outputs.artifact-url }}" >> $GITHUB_OUTPUT
 
 
   build_sigrok-cli_mxe:
@@ -165,6 +169,9 @@ jobs:
       WGET: "wget -c --quiet --no-check-certificate"
       ARTIFACT_VERSION: "NIGHTLY"
 
+    outputs:
+      pr-links: ${{ steps.pr_links.outputs.PR_LINKS }}
+
     steps:
       - name: Set artifact version to PR
         if: (github.event_name == 'pull_request')
@@ -233,10 +240,11 @@ jobs:
           path: sigrok-cli/contrib/sigrok-cli*installer.exe
 
       - name: Add artifact to pull request message
+        id: pr_links
         # Only relevant for pull requests
         if: (github.event_name == 'pull_request')
         run: |
-          echo "PR_LINKS=$PR_LINKS | sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-debug-installer.exe | ${{ steps.upload.outputs.artifact-url }}" >> $GITHUB_ENV
+          echo "PR_LINKS=$PR_LINKS | sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-debug-installer.exe | ${{ steps.upload.outputs.artifact-url }}" >> $GITHUB_OUTPUT
 
 
   build_pulseview_appimage:
@@ -283,6 +291,9 @@ jobs:
       ARTIFACT_BIN_NAME: "pulseview"
       ARTIFACT_VERSION: "NIGHTLY"
 
+    outputs:
+      pr-links: ${{ steps.pr_links.outputs.PR_LINKS }}
+
     steps:
       - name: Set artifact version to PR
         if: (github.event_name == 'pull_request')
@@ -359,10 +370,11 @@ jobs:
           path: sigrok-build/ci/appimage/appimage-build/pulseview-*.appimage
 
       - name: Add artifact to pull request message
+        id: pr_links
         # Only relevant for pull requests
         if: (github.event_name == 'pull_request')
         run: |
-          echo "PR_LINKS=$PR_LINKS | pulseview-${{ matrix.target.target }}-${{ matrix.build_type.name }}-appimage | ${{ steps.upload.outputs.artifact-url }}" >> $GITHUB_ENV
+          echo "PR_LINKS=$PR_LINKS | pulseview-${{ matrix.target.target }}-${{ matrix.build_type.name }}-appimage | ${{ steps.upload.outputs.artifact-url }}" >> $GITHUB_OUTPUT
 
 
   build_sigrok-cli_appimage:
@@ -405,6 +417,9 @@ jobs:
       ARTIFACT_BIN_NAME: "sigrok-cli"
       ARTIFACT_VERSION: "NIGHTLY"
 
+    outputs:
+      pr-links: ${{ steps.pr_links.outputs.PR_LINKS }}
+
     steps:
       - name: Set artifact version to PR
         if: (github.event_name == 'pull_request')
@@ -478,10 +493,11 @@ jobs:
           path: sigrok-build/ci/appimage/appimage-build/sigrok-cli-*.appimage
 
       - name: Add artifact to pull request message
+        id: pr_links
         # Only relevant for pull requests
         if: (github.event_name == 'pull_request')
         run: |
-          echo "PR_LINKS=$PR_LINKS | sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-debug.appimage | ${{ steps.upload.outputs.artifact-url }}" >> $GITHUB_ENV
+          echo "PR_LINKS=$PR_LINKS | sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-debug.appimage | ${{ steps.upload.outputs.artifact-url }}" >> $GITHUB_OUTPUT
 
 
   build_pulseview_macos:
@@ -509,6 +525,9 @@ jobs:
       ARTIFACT_BIN_NAME: "pulseview"
       ARTIFACT_VERSION: "NIGHTLY"
 
+    outputs:
+      pr-links: ${{ steps.pr_links.outputs.PR_LINKS }}
+
     steps:
       - name: Set artifact version to PR
         if: (github.event_name == 'pull_request')
@@ -582,10 +601,11 @@ jobs:
           path: sigrok-build/ci/macos/pulseview*.dmg
 
       - name: Add artifact to pull request message
+        id: pr_links
         # Only relevant for pull requests
         if: (github.event_name == 'pull_request')
         run: |
-          echo "PR_LINKS=$PR_LINKS | pulseview-${{ env.ARTIFACT_VERSION }}-${{ env.TARGET }}.dmg | ${{ steps.upload.outputs.artifact-url }}" >> $GITHUB_ENV
+          echo "PR_LINKS=$PR_LINKS | pulseview-${{ env.ARTIFACT_VERSION }}-${{ env.TARGET }}.dmg | ${{ steps.upload.outputs.artifact-url }}" >> $GITHUB_OUTPUT
 
 
   build_sigrok-cli_macos:
@@ -606,6 +626,9 @@ jobs:
       ARTIFACT_BIN_NAME: "sigrok-cli"
       ARTIFACT_VERSION: "NIGHTLY"
 
+    outputs:
+      pr-links: ${{ steps.pr_links.outputs.PR_LINKS }}
+
     steps:
       - name: Set artifact version to PR
         if: (github.event_name == 'pull_request')
@@ -670,10 +693,11 @@ jobs:
           path: sigrok-build/ci/macos/sigrok-cli*.dmg
 
       - name: Add artifact to pull request message
+        id: pr_links
         # Only relevant for pull requests
         if: (github.event_name == 'pull_request')
         run: |
-          echo "PR_LINKS=$PR_LINKS | sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ env.TARGET }}.dmg | ${{ steps.upload.outputs.artifact-url }}" >> $GITHUB_ENV
+          echo "PR_LINKS=$PR_LINKS | sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ env.TARGET }}.dmg | ${{ steps.upload.outputs.artifact-url }}" >> $GITHUB_OUTPUT
 
 
   continuous_release_pulseview:
@@ -776,7 +800,7 @@ jobs:
     runs-on: ubuntu-latest
 
     needs:
-      # Keep in sync with job continuous_release_pulseview
+      # Keep in sync with job continuous_release_pulseview and see below, too
       - build_pulseview_mxe
       - build_pulseview_appimage
       - build_pulseview_macos
@@ -790,7 +814,9 @@ jobs:
 
             | Build | Link |
             ---------------------------------------------------
-            ${{ env.PR_LINKS }}
+            ${{ needs.build_pulseview_appimage.outputs.pr_links }}
+            ${{ needs.build_pulseview_mxe.outputs.pr_links }}
+            ${{ needs.build_pulseview_macos.outputs.pr_links }}
 
             Note: Binaries are removed after 90 days. If necessary, re-trigger a build by commenting '/build'.
         with:
@@ -811,7 +837,7 @@ jobs:
     runs-on: ubuntu-latest
 
     needs:
-      # Keep in sync with job continuous_release_pulseview
+      # Keep in sync with job continuous_release_pulseview and see below, too
       - build_sigrok-cli_mxe
       - build_sigrok-cli_appimage
       - build_sigrok-cli_macos
@@ -825,7 +851,9 @@ jobs:
 
             | Build | Link |
             ---------------------------------------------------
-            ${{ env.PR_LINKS }}
+            ${{ needs.build_sigrok-cli_appimage.outputs.pr_links }}
+            ${{ needs.build_sigrok-cli_mxe.outputs.pr_links }}
+            ${{ needs.build_sigrok-cli_macos.outputs.pr_links }}
 
             Note: Binaries are removed after 90 days. If necessary, re-trigger a build by commenting '/build'.
         with: