Skip to content

Commit 13ec44c

Browse files
authored
ci: release-candidate changes (#470)
1 parent a9e3439 commit 13ec44c

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

template/.github/workflows/build.yml.j2

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- trying
1414
- "renovate/**"
1515
tags:
16-
- '[0-9][0-9].[0-9]+.[0-9]+'
16+
- '[0-9][0-9].[0-9]+.[0-9]+(-rc[0-9]+)?'
1717
pull_request:
1818
merge_group:
1919
schedule:
@@ -345,7 +345,8 @@ jobs:
345345
crate: cargo-edit
346346
bin: cargo-set-version
347347
- name: Update version if PR
348-
if: ${{ github.event_name == 'pull_request' }}
348+
# For PRs to be merged against a release branch, the version has already been set, in which case ignore this step.
349+
if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
349350
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
350351

351352
# Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the
@@ -411,7 +412,8 @@ jobs:
411412
crate: cargo-edit
412413
bin: cargo-set-version
413414
- name: Update version if PR
414-
if: ${{ github.event_name == 'pull_request' }}
415+
# For PRs to be merged against a release branch, the version has already been set, in which case ignore this step.
416+
if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
415417
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
416418
- name: Build manifest list
417419
run: |

0 commit comments

Comments
 (0)