diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b4abe7..9217c8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -350,13 +350,15 @@ jobs: 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. + # We can't rely on cargo set-version here as we will break semver rules when changing the version to make it + # specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually. 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" + sed -i "s/version = \"${MANIFEST_VERSION}\"/version = \"${PR_VERSION}\"/" Cargo.toml # 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). @@ -425,13 +427,15 @@ jobs: 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. + # We can't rely on cargo set-version here as we will break semver rules when changing the version to make it + # specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually. 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" + sed -i "s/version = \"${MANIFEST_VERSION}\"/version = \"${PR_VERSION}\"/" Cargo.toml - name: Build manifest list run: | # Creating manifest list diff --git a/CHANGELOG.md b/CHANGELOG.md index 353a781..db0e009 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [24.11.1] - 2025-01-10 + ## [24.11.1-rc2] - 2024-12-12 ## [24.11.1-rc1] - 2024-12-06 diff --git a/Cargo.lock b/Cargo.lock index 6f24fe0..cf4ab3c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2166,7 +2166,7 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stackable-hello-world-operator" -version = "24.11.1-rc2" +version = "24.11.1" dependencies = [ "anyhow", "built", diff --git a/Cargo.nix b/Cargo.nix index 81cac36..05f886e 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6669,7 +6669,7 @@ rec { }; "stackable-hello-world-operator" = rec { crateName = "stackable-hello-world-operator"; - version = "24.11.1-rc2"; + version = "24.11.1"; edition = "2021"; crateBin = [ { diff --git a/Cargo.toml b/Cargo.toml index 049fb1e..4f131ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust/operator-binary"] resolver = "2" [workspace.package] -version = "24.11.1-rc2" +version = "24.11.1" authors = ["Stackable GmbH "] license = "OSL-3.0" edition = "2021" diff --git a/deploy/helm/hello-world-operator/Chart.yaml b/deploy/helm/hello-world-operator/Chart.yaml index f1c9638..5deaded 100644 --- a/deploy/helm/hello-world-operator/Chart.yaml +++ b/deploy/helm/hello-world-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: hello-world-operator -version: "24.11.1-rc2" -appVersion: "24.11.1-rc2" +version: "24.11.1" +appVersion: "24.11.1" description: The Stackable Operator for Hello World home: https://github.com/stackabletech/hello-world-operator maintainers: diff --git a/tests/release.yaml b/tests/release.yaml index 1dbee72..cc58cf4 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,4 +7,4 @@ releases: description: Integration test products: hello-world: - operatorVersion: 24.11.1-rc2 + operatorVersion: 24.11.1