|
13 | 13 | - trying |
14 | 14 | - "renovate/**" |
15 | 15 | tags: |
16 | | - - '[0-9][0-9].[0-9]+.[0-9]+(-rc[0-9]+)?' |
| 16 | + - '[0-9][0-9].[0-9]+.[0-9]+' |
| 17 | + - '[0-9][0-9].[0-9]+.[0-9]+-rc[0-9]+' |
17 | 18 | pull_request: |
18 | 19 | merge_group: |
19 | 20 | schedule: |
@@ -345,11 +346,15 @@ jobs: |
345 | 346 | crate: cargo-edit |
346 | 347 | bin: cargo-set-version |
347 | 348 | - name: Update version if PR against main branch |
348 | | - if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }} |
349 | | - 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" |
350 | 355 | - name: Update version if PR against non-main branch |
351 | 356 | # For PRs to be merged against a release branch, use the version that has already been set in the calling script. |
352 | | - 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-') }} |
353 | 358 | env: |
354 | 359 | PR_NUMBER: ${{ github.event.pull_request.number }} |
355 | 360 | run: | |
@@ -420,11 +425,15 @@ jobs: |
420 | 425 | crate: cargo-edit |
421 | 426 | bin: cargo-set-version |
422 | 427 | - name: Update version if PR against main branch |
423 | | - if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }} |
424 | | - 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" |
425 | 434 | - name: Update version if PR against non-main branch |
426 | 435 | # For PRs to be merged against a release branch, use the version that has already been set in the calling script. |
427 | | - 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-') }} |
428 | 437 | env: |
429 | 438 | PR_NUMBER: ${{ github.event.pull_request.number }} |
430 | 439 | run: | |
|
0 commit comments