Skip to content

fix: PR base branch condition #473

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 3 commits into from
Dec 10, 2024
Merged

fix: PR base branch condition #473

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7a89c2
fix: PR base branch condition
adwk67 Dec 10, 2024
ee48a9a
Apply suggestions from code review
adwk67 Dec 10, 2024
e396e98
add variable
adwk67 Dec 10, 2024
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
20 changes: 14 additions & 6 deletions template/.github/workflows/build.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,11 +346,15 @@ jobs:
crate: cargo-edit
bin: cargo-set-version
- name: Update version if PR against main branch
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 }}
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main' }}
env:
PR_NUMBER: ${{ github.event.pull_request.number }}
run: |
PR_VERSION="0.0.0-pr${PR_NUMBER}"
cargo set-version --offline --workspace "$PR_VERSION"
- 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' }}
if: ${{ github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release-') }}
env:
PR_NUMBER: ${{ github.event.pull_request.number }}
run: |
Expand Down Expand Up @@ -421,11 +425,15 @@ jobs:
crate: cargo-edit
bin: cargo-set-version
- name: Update version if PR against main branch
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 }}
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main' }}
env:
PR_NUMBER: ${{ github.event.pull_request.number }}
run: |
PR_VERSION="0.0.0-pr${PR_NUMBER}"
cargo set-version --offline --workspace "$PR_VERSION"
- 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' }}
if: ${{ github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release-') }}
env:
PR_NUMBER: ${{ github.event.pull_request.number }}
run: |
Expand Down
Loading