Skip to content
This repository was archived by the owner on Jun 6, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["rust/operator-binary"]
resolver = "2"

[workspace.package]
version = "24.11.1-rc2"
version = "24.11.1"
authors = ["Stackable GmbH <[email protected]>"]
license = "OSL-3.0"
edition = "2021"
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/hello-world-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ releases:
description: Integration test
products:
hello-world:
operatorVersion: 24.11.1-rc2
operatorVersion: 24.11.1
Loading