release-24.11/24.11.1-rc1 (#143)

* release 24.11.1-rc1

Signed-off-by: Andrew Kenworthy <[email protected]>

* chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@13ec44c (#141)

Reference-to: stackabletech/operator-templating@13ec44c (Workflow changes in preparation for release-candidates)

* chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@2b806e1 (#142)

Reference-to: stackabletech/operator-templating@2b806e1 (Set PR-suffix on PRs against release branches)

* Update .github/workflows/build.yml

Co-authored-by: Nick <[email protected]>

---------

Signed-off-by: Andrew Kenworthy <[email protected]>
Co-authored-by: Stacky McStackface <[email protected]>
Co-authored-by: Nick <[email protected]>

Author: 3 people

.github/workflows/build.yml

@@ -14,6 +14,7 @@ on:
       - "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:
@@ -344,9 +345,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 +420,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

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [24.11.1-rc1] - 2024-12-06
+
 ## [24.11.0] - 2024-11-18
 
 ### Added

Cargo.lock

@@ -3,7 +3,7 @@ members = ["rust/operator-binary"]
 resolver = "2"
 
 [workspace.package]
-version = "24.11.0"
+version = "24.11.1-rc1"
 authors = ["Stackable GmbH <[email protected]>"]
 license = "OSL-3.0"
 edition = "2021"

Cargo.nix

@@ -1,8 +1,8 @@
 ---
 apiVersion: v2
 name: hello-world-operator
-version: "24.11.0"
-appVersion: "24.11.0"
+version: "24.11.1-rc1"
+appVersion: "24.11.1-rc1"
 description: The Stackable Operator for Hello World
 home: https://github.com/stackabletech/hello-world-operator
 maintainers:

Cargo.toml

@@ -7,4 +7,4 @@ releases:
     description: Integration test
     products:
       hello-world:
-        operatorVersion: 24.11.0
+        operatorVersion: 24.11.1-rc1