Skip to content

Commit

Permalink
release-24.11/24.11.1-rc1 (#260)
Browse files Browse the repository at this point in the history
* release 24.11.1-rc1

Signed-off-by: Andrew Kenworthy <andrew.kenworthy@stackable.de>

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

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 (#259)

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

* Update .github/workflows/build.yml

Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com>

---------

Signed-off-by: Andrew Kenworthy <andrew.kenworthy@stackable.de>
Co-authored-by: Stacky McStackface <95074132+stackable-bot@users.noreply.github.com>
Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com>
  • Loading branch information
3 people authored Dec 9, 2024
1 parent 707952a commit 7a0109a
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 13 deletions.
27 changes: 23 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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).
Expand Down Expand Up @@ -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
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-rc1] - 2024-12-06

## [24.11.0] - 2024-11-18

### Added
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions 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", "rust/csi-grpc"]
resolver = "2"

[workspace.package]
version = "24.11.0"
version = "24.11.1-rc1"
authors = ["Stackable GmbH <info@stackable.tech>"]
license = "OSL-3.0"
edition = "2021"
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/listener-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
apiVersion: v2
name: listener-operator
version: "24.11.0"
appVersion: "24.11.0"
version: "24.11.1-rc1"
appVersion: "24.11.1-rc1"
description: The Stackable Operator for Stackable Listener Operator
home: https://github.com/stackabletech/listener-operator
maintainers:
Expand Down
4 changes: 2 additions & 2 deletions tests/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ releases:
description: Integration test
products:
commons:
operatorVersion: 24.11.0
operatorVersion: 24.11.1-rc1
listener:
operatorVersion: 24.11.0
operatorVersion: 24.11.1-rc1

0 comments on commit 7a0109a

Please sign in to comment.