fix: make conditions mutually exclusive

stackabletech · Jan 28, 2025 · 508ef88 · 508ef88
1 parent 20d91e7
commit 508ef88
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/template/.github/workflows/build.yml.j2 b/template/.github/workflows/build.yml.j2
@@ -356,7 +356,7 @@ jobs:
         # For PRs to be merged against a release branch, use the version that has already been set in the calling script.
         # We can't rely on cargo set-version here as we will break semver rules when changing the version to make it
         # specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually.
-        if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
+        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'main' }}
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
         shell: bash
@@ -440,7 +440,7 @@ jobs:
         # For PRs to be merged against a release branch, use the version that has already been set in the calling script.
         # We can't rely on cargo set-version here as we will break semver rules when changing the version to make it
         # specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually.
-        if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
+        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'main' }}
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
         shell: bash