diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f67bc74..61a50f51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ on: - trying - "renovate/**" tags: - - '[0-9][0-9].[0-9]+.[0-9]+' + - '[0-9][0-9].[0-9]+.[0-9]+(-rc[0-9]+)?' pull_request: merge_group: schedule: @@ -25,7 +25,7 @@ env: CARGO_TERM_COLOR: always CARGO_INCREMENTAL: '0' CARGO_PROFILE_DEV_DEBUG: '0' - RUST_TOOLCHAIN_VERSION: "1.81.0" + RUST_TOOLCHAIN_VERSION: "1.82.0" RUSTFLAGS: "-D warnings" RUSTDOCFLAGS: "-D warnings" RUST_LOG: "info" @@ -344,9 +344,18 @@ jobs: with: crate: cargo-edit bin: cargo-set-version - - name: Update version if PR - if: ${{ github.event_name == 'pull_request' }} + - name: Update version if PR against main branch + if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }} run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }} + - name: Update version if PR against non-main branch + # For PRs to be merged against a release branch, use the version that has already been set in the calling script. + if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} + env: + PR_NUMBER: ${{ github.event.pull_request.number }} + run: | + MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') + PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}" + cargo set-version --offline --workspace "$PR_VERSION" # Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the # default value in the makefile if called from this action, but not otherwise (i.e. when called locally). @@ -410,9 +419,18 @@ jobs: with: crate: cargo-edit bin: cargo-set-version - - name: Update version if PR - if: ${{ github.event_name == 'pull_request' }} + - name: Update version if PR against main branch + if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }} run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }} + - name: Update version if PR against non-main branch + # For PRs to be merged against a release branch, use the version that has already been set in the calling script. + if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} + env: + PR_NUMBER: ${{ github.event.pull_request.number }} + run: | + MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') + PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}" + cargo set-version --offline --workspace "$PR_VERSION" - name: Build manifest list run: | # Creating manifest list diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 8cda55cb..24eb3372 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -21,12 +21,16 @@ on: inputs: test-platform: description: | - The test platform to run on (kind doesn't support `arm64`) + The test platform to run on required: true type: choice options: - - kind-1.31.0 - - kind-1.30.3 + - kind-1.31.2 + - kind-1.30.6 + - rke2-1.31.2 + - rke2-1.30.6 + - k3s-1.31.2 + - k3s-1.30.6 - aks-1.29 - aks-1.28 - aks-1.27 @@ -41,7 +45,8 @@ on: - okd-4.13 test-architecture: description: | - The architecture the tests will run on + The architecture the tests will run on. Consult the run-integration-test action README for + more details on supported architectures for each distribution required: true type: choice options: @@ -81,7 +86,7 @@ jobs: - name: Run Integration Test id: test - uses: stackabletech/actions/run-integration-test@5b66858af3597c4ea34f9b33664b8034a1d28427 # v0.3.0 + uses: stackabletech/actions/run-integration-test@5901c3b1455488820c4be367531e07c3c3e82538 # v0.4.0 with: test-platform: ${{ env.TEST_PLATFORM }}-${{ env.TEST_ARCHITECTURE }} test-run: ${{ env.TEST_RUN }} diff --git a/.github/workflows/pr_pre-commit.yaml b/.github/workflows/pr_pre-commit.yaml index 1442383b..10a853c3 100644 --- a/.github/workflows/pr_pre-commit.yaml +++ b/.github/workflows/pr_pre-commit.yaml @@ -6,7 +6,7 @@ on: env: CARGO_TERM_COLOR: always - RUST_TOOLCHAIN_VERSION: "1.81.0" + RUST_TOOLCHAIN_VERSION: "1.82.0" HADOLINT_VERSION: "v2.12.0" PYTHON_VERSION: "3.12" diff --git a/Cargo.nix b/Cargo.nix index ba4ed259..c1b133fe 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -1375,33 +1375,6 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "powerfmt" "std" ]; }; - "derivative" = rec { - crateName = "derivative"; - version = "2.2.0"; - edition = "2015"; - sha256 = "02vpb81wisk2zh1d5f44szzxamzinqgq2k8ydrfjj2wwkrgdvhzw"; - procMacro = true; - authors = [ - "mcarton " - ]; - dependencies = [ - { - name = "proc-macro2"; - packageId = "proc-macro2"; - } - { - name = "quote"; - packageId = "quote"; - } - { - name = "syn"; - packageId = "syn 1.0.109"; - features = [ "visit" "extra-traits" ]; - } - ]; - features = { - }; - }; "digest" = rec { crateName = "digest"; version = "0.10.7"; @@ -1536,7 +1509,7 @@ rec { "default" = [ "Debug" "Clone" "Copy" "PartialEq" "Eq" "PartialOrd" "Ord" "Hash" "Default" "Deref" "DerefMut" "Into" ]; "full" = [ "syn/full" ]; }; - resolvedDefaultFeatures = [ "Clone" "Debug" "Hash" "PartialEq" ]; + resolvedDefaultFeatures = [ "Clone" "Debug" "Default" "Hash" "PartialEq" ]; }; "either" = rec { crateName = "either"; @@ -5664,9 +5637,9 @@ rec { }; "rustls" = rec { crateName = "rustls"; - version = "0.23.15"; + version = "0.23.19"; edition = "2021"; - sha256 = "14vr5pfdvzfcqrmjzh1834a1nyi3kzv7j8s22gb77s64mkbl9fsz"; + sha256 = "1lgqjf1vh09kghyj34a4svn1max18pmhka6bwbxb61mv61240jwk"; dependencies = [ { name = "log"; @@ -6827,13 +6800,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.82.0"; + version = "0.83.0"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "415bbd031bd52e9c0c5392060235030e9930b46b"; - sha256 = "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy"; + rev = "3ce7bcbdb58097cde0c0f19488a104c96f69dbc3"; + sha256 = "1443vhsanfl2vxp6x6zpylfln682g0y8bxbk4sknycsg009mbkwm"; }; libName = "stackable_operator"; authors = [ @@ -6858,14 +6831,16 @@ rec { name = "delegate"; packageId = "delegate"; } - { - name = "derivative"; - packageId = "derivative"; - } { name = "dockerfile-parser"; packageId = "dockerfile-parser"; } + { + name = "educe"; + packageId = "educe"; + usesDefaultFeatures = false; + features = [ "Clone" "Debug" "Default" "PartialEq" ]; + } { name = "either"; packageId = "either"; @@ -6990,8 +6965,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "415bbd031bd52e9c0c5392060235030e9930b46b"; - sha256 = "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy"; + rev = "3ce7bcbdb58097cde0c0f19488a104c96f69dbc3"; + sha256 = "1443vhsanfl2vxp6x6zpylfln682g0y8bxbk4sknycsg009mbkwm"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -7025,8 +7000,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "415bbd031bd52e9c0c5392060235030e9930b46b"; - sha256 = "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy"; + rev = "3ce7bcbdb58097cde0c0f19488a104c96f69dbc3"; + sha256 = "1443vhsanfl2vxp6x6zpylfln682g0y8bxbk4sknycsg009mbkwm"; }; libName = "stackable_shared"; authors = [ @@ -7178,7 +7153,7 @@ rec { "quote" = [ "dep:quote" ]; "test" = [ "syn-test-suite/all-features" ]; }; - resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "quote" "visit" ]; + resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "full" "parsing" "printing" "proc-macro" "quote" ]; }; "syn 2.0.82" = rec { crateName = "syn"; diff --git a/crate-hashes.json b/crate-hashes.json index 0ca37e6e..e00798ae 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,6 +1,6 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#stackable-operator-derive@0.3.1": "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#stackable-operator@0.82.0": "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#stackable-shared@0.0.1": "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.83.0#stackable-operator-derive@0.3.1": "1443vhsanfl2vxp6x6zpylfln682g0y8bxbk4sknycsg009mbkwm", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.83.0#stackable-operator@0.83.0": "1443vhsanfl2vxp6x6zpylfln682g0y8bxbk4sknycsg009mbkwm", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.83.0#stackable-shared@0.0.1": "1443vhsanfl2vxp6x6zpylfln682g0y8bxbk4sknycsg009mbkwm", "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny" } \ No newline at end of file diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d587e661..13b4ec5c 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ # DO NOT EDIT, this file is generated by operator-templating [toolchain] -channel = "1.81.0" +channel = "1.82.0"