Merge branch 'main' into chore/switch-to-oci-repo

stackabletech · Jan 29, 2025 · c7e894f · c7e894f
2 parents 2aec037 + 303f281
commit c7e894f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -356,7 +356,7 @@ jobs:
         # 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' }}
+        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'main' }}
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
         shell: bash
@@ -440,7 +440,7 @@ jobs:
         # 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' }}
+        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'main' }}
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
         shell: bash

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,17 +14,20 @@ All notable changes to this project will be documented in this file.
 - Made RSA key length configurable for certificates issued by cert-manager ([#528]).
 - Kerberos principal backends now also provision principals for IP address, not just DNS hostnames ([#552]).
 
+[#528]: https://github.com/stackabletech/secret-operator/pull/528
+[#548]: https://github.com/stackabletech/secret-operator/pull/548
+[#552]: https://github.com/stackabletech/secret-operator/pull/552
+
+## [24.11.1] - 2025-01-10
+
 ### Fixed
 
 - Helm chart: The secret migration job can be omitted via Helm values ([#536]).
 - Helm chart: The tag of the tools image used for the secret migration job can
   be changed in the Helm values and defaults now to 1.0.0-stackable24.11.0
   rather than being hard-coded to 1.0.0-stackable24.7.0 ([#536]).
 
-[#528]: https://github.com/stackabletech/secret-operator/pull/528
 [#536]: https://github.com/stackabletech/secret-operator/pull/536
-[#548]: https://github.com/stackabletech/secret-operator/pull/548
-[#552]: https://github.com/stackabletech/secret-operator/pull/552
 
 ## [24.11.0] - 2024-11-18