Skip to content

fix: Make PR version conditions mutually exclusive #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2025
Merged

fix: Make PR version conditions mutually exclusive #479

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions template/.github/workflows/build.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down