@@ -346,11 +346,15 @@ jobs:
346
346
crate: cargo-edit
347
347
bin: cargo-set-version
348
348
- name: Update version if PR against main branch
349
- if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
350
- run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
349
+ if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main' }}
350
+ env:
351
+ PR_NUMBER: ${{ github.event.pull_request.number }}
352
+ run: |
353
+ PR_VERSION="0.0.0-pr${PR_NUMBER}"
354
+ cargo set-version --offline --workspace "$PR_VERSION"
351
355
- name: Update version if PR against non-main branch
352
356
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
353
- if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
357
+ if: ${{ github.event_name == 'pull_request' && startsWith( github.event.pull_request.base. ref, 'release-') }}
354
358
env:
355
359
PR_NUMBER: ${{ github.event.pull_request.number }}
356
360
run: |
@@ -421,11 +425,15 @@ jobs:
421
425
crate: cargo-edit
422
426
bin: cargo-set-version
423
427
- name: Update version if PR against main branch
424
- if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
425
- run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
428
+ if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main' }}
429
+ env:
430
+ PR_NUMBER: ${{ github.event.pull_request.number }}
431
+ run: |
432
+ PR_VERSION="0.0.0-pr${PR_NUMBER}"
433
+ cargo set-version --offline --workspace "$PR_VERSION"
426
434
- name: Update version if PR against non-main branch
427
435
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
428
- if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
436
+ if: ${{ github.event_name == 'pull_request' && startsWith( github.event.pull_request.base. ref, 'release-') }}
429
437
env:
430
438
PR_NUMBER: ${{ github.event.pull_request.number }}
431
439
run: |
0 commit comments