Skip to content

Commit c134ace

Browse files
chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@13ec44c (#601)
Reference-to: stackabletech/operator-templating@13ec44c (Workflow changes in preparation for release-candidates)
1 parent dcd94b0 commit c134ace

File tree

6 files changed

+38
-56
lines changed

6 files changed

+38
-56
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 4 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:
@@ -25,7 +25,7 @@ env:
2525
CARGO_TERM_COLOR: always
2626
CARGO_INCREMENTAL: '0'
2727
CARGO_PROFILE_DEV_DEBUG: '0'
28-
RUST_TOOLCHAIN_VERSION: "1.81.0"
28+
RUST_TOOLCHAIN_VERSION: "1.82.0"
2929
RUSTFLAGS: "-D warnings"
3030
RUSTDOCFLAGS: "-D warnings"
3131
RUST_LOG: "info"
@@ -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: |

.github/workflows/integration-test.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,16 @@ on:
2121
inputs:
2222
test-platform:
2323
description: |
24-
The test platform to run on (kind doesn't support `arm64`)
24+
The test platform to run on
2525
required: true
2626
type: choice
2727
options:
28-
- kind-1.31.0
29-
- kind-1.30.3
28+
- kind-1.31.2
29+
- kind-1.30.6
30+
- rke2-1.31.2
31+
- rke2-1.30.6
32+
- k3s-1.31.2
33+
- k3s-1.30.6
3034
- aks-1.29
3135
- aks-1.28
3236
- aks-1.27
@@ -41,7 +45,8 @@ on:
4145
- okd-4.13
4246
test-architecture:
4347
description: |
44-
The architecture the tests will run on
48+
The architecture the tests will run on. Consult the run-integration-test action README for
49+
more details on supported architectures for each distribution
4550
required: true
4651
type: choice
4752
options:
@@ -81,7 +86,7 @@ jobs:
8186

8287
- name: Run Integration Test
8388
id: test
84-
uses: stackabletech/actions/run-integration-test@5b66858af3597c4ea34f9b33664b8034a1d28427 # v0.3.0
89+
uses: stackabletech/actions/run-integration-test@5901c3b1455488820c4be367531e07c3c3e82538 # v0.4.0
8590
with:
8691
test-platform: ${{ env.TEST_PLATFORM }}-${{ env.TEST_ARCHITECTURE }}
8792
test-run: ${{ env.TEST_RUN }}

.github/workflows/pr_pre-commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
env:
88
CARGO_TERM_COLOR: always
9-
RUST_TOOLCHAIN_VERSION: "1.81.0"
9+
RUST_TOOLCHAIN_VERSION: "1.82.0"
1010
HADOLINT_VERSION: "v2.12.0"
1111
PYTHON_VERSION: "3.12"
1212

Cargo.nix

Lines changed: 17 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crate-hashes.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# DO NOT EDIT, this file is generated by operator-templating
22
[toolchain]
3-
channel = "1.81.0"
3+
channel = "1.82.0"

0 commit comments

Comments
 (0)