use env for PR number

stackabletech · Dec 6, 2024 · 25bb9f6 · 25bb9f6
1 parent a598424
commit 25bb9f6
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -348,10 +348,13 @@ jobs:
         if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
         run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
       - name: Update version if PR against non-main branch
+        # For PRs to be merged against a release branch, use the version that has already been set in the calling script.
         if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
         run: |
           MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
-          PR_VERSION="${MANIFEST_VERSION}-pr${{ github.event.pull_request.number }}"
+          PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}"
           cargo set-version --offline --workspace "$PR_VERSION"
 
       # Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the
@@ -420,10 +423,13 @@ jobs:
         if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
         run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
       - name: Update version if PR against non-main branch
+        # For PRs to be merged against a release branch, use the version that has already been set in the calling script.
         if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
         run: |
           MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
-          PR_VERSION="${MANIFEST_VERSION}-pr${{ github.event.pull_request.number }}"
+          PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}"
           cargo set-version --offline --workspace "$PR_VERSION"
       - name: Build manifest list
         run: |