Skip to content

Commit 300b8cd

Browse files
chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@8e7969c (#667)
Reference-to: stackabletech/operator-templating@8e7969c (Fix workflow branch condition)
1 parent c5145fe commit 300b8cd

File tree

2 files changed

+1545
-513
lines changed

2 files changed

+1545
-513
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ on:
1313
- trying
1414
- "renovate/**"
1515
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]+'
1718
pull_request:
1819
merge_group:
1920
schedule:
@@ -346,7 +347,11 @@ jobs:
346347
bin: cargo-set-version
347348
- name: Update version if PR against main branch
348349
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main' }}
349-
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
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"
350355
- name: Update version if PR against non-main branch
351356
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
352357
if: ${{ github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release-') }}
@@ -421,7 +426,11 @@ jobs:
421426
bin: cargo-set-version
422427
- name: Update version if PR against main branch
423428
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main' }}
424-
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
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"
425434
- name: Update version if PR against non-main branch
426435
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
427436
if: ${{ github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release-') }}

0 commit comments

Comments
 (0)