Skip to content

Commit 411a4e2

Browse files
authored
Merge pull request #674 from stackabletech/pr-24.11.1
release: 24.11.1
2 parents ee11ac2 + cb0d24d commit 411a4e2

File tree

10 files changed

+29
-23
lines changed

10 files changed

+29
-23
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,13 +350,15 @@ jobs:
350350
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
351351
- name: Update version if PR against non-main branch
352352
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
353+
# We can't rely on cargo set-version here as we will break semver rules when changing the version to make it
354+
# specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually.
353355
if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
354356
env:
355357
PR_NUMBER: ${{ github.event.pull_request.number }}
356358
run: |
357359
MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
358360
PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}"
359-
cargo set-version --offline --workspace "$PR_VERSION"
361+
sed -i "s/version = \"${MANIFEST_VERSION}\"/version = \"${PR_VERSION}\"/" Cargo.toml
360362
361363
# Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the
362364
# default value in the makefile if called from this action, but not otherwise (i.e. when called locally).
@@ -425,13 +427,15 @@ jobs:
425427
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
426428
- name: Update version if PR against non-main branch
427429
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
430+
# We can't rely on cargo set-version here as we will break semver rules when changing the version to make it
431+
# specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually.
428432
if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
429433
env:
430434
PR_NUMBER: ${{ github.event.pull_request.number }}
431435
run: |
432436
MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
433437
PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}"
434-
cargo set-version --offline --workspace "$PR_VERSION"
438+
sed -i "s/version = \"${MANIFEST_VERSION}\"/version = \"${PR_VERSION}\"/" Cargo.toml
435439
- name: Build manifest list
436440
run: |
437441
# Creating manifest list

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
## [24.11.1] - 2025-01-10
8+
79
## [24.11.1-rc2] - 2024-12-12
810

911
## [24.11.1-rc1] - 2024-12-06

Cargo.lock

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

Cargo.nix

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ members = ["rust/*"]
33
resolver = "2"
44

55
[workspace.package]
6-
version = "24.11.1-rc2"
6+
version = "24.11.1"
77
authors = ["Stackable GmbH <info@stackable.tech>"]
88
license = "OSL-3.0"
99
edition = "2021"

deploy/helm/opa-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
apiVersion: v2
33
name: opa-operator
4-
version: "24.11.1-rc2"
5-
appVersion: "24.11.1-rc2"
4+
version: "24.11.1"
5+
appVersion: "24.11.1"
66
description: The Stackable Operator for OpenPolicyAgent
77
home: https://github.com/stackabletech/opa-operator
88
maintainers:

docs/modules/opa/examples/getting_started/getting_started.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ helm repo update
2828

2929
echo "Installing operators with Helm"
3030
# tag::helm-install-operators[]
31-
helm install --wait opa-operator stackable-stable/opa-operator --version 24.11.1-rc2
31+
helm install --wait opa-operator stackable-stable/opa-operator --version 24.11.1
3232
# end::helm-install-operators[]
3333
;;
3434
"stackablectl")
3535
echo "installing operators with stackablectl"
3636
# tag::stackablectl-install-operators[]
37-
stackablectl operator install opa=24.11.1-rc2
37+
stackablectl operator install opa=24.11.1
3838
# end::stackablectl-install-operators[]
3939
;;
4040
*)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Installed opa=24.11.1-rc2 operator
1+
Installed opa=24.11.1 operator

docs/templating_vars.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ helm:
33
repo_name: stackable-stable
44
repo_url: https://repo.stackable.tech/repository/helm-stable/
55
versions:
6-
opa: 24.11.1-rc2
6+
opa: 24.11.1

tests/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ releases:
77
description: Integration test
88
products:
99
commons:
10-
operatorVersion: 24.11.1-rc2
10+
operatorVersion: 24.11.1
1111
secret:
12-
operatorVersion: 24.11.1-rc2
12+
operatorVersion: 24.11.1
1313
listener:
14-
operatorVersion: 24.11.1-rc2
14+
operatorVersion: 24.11.1
1515
opa:
16-
operatorVersion: 24.11.1-rc2
16+
operatorVersion: 24.11.1

0 commit comments

Comments
 (0)