Skip to content

Commit e38dfc7

Browse files
authored
Merge branch 'main' into chore/switch-to-oci-repo
2 parents 0215382 + 82dadf5 commit e38dfc7

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ jobs:
356356
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
357357
# We can't rely on cargo set-version here as we will break semver rules when changing the version to make it
358358
# specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually.
359-
if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
359+
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'main' }}
360360
env:
361361
PR_NUMBER: ${{ github.event.pull_request.number }}
362362
shell: bash
@@ -440,7 +440,7 @@ jobs:
440440
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
441441
# We can't rely on cargo set-version here as we will break semver rules when changing the version to make it
442442
# specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually.
443-
if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
443+
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'main' }}
444444
env:
445445
PR_NUMBER: ${{ github.event.pull_request.number }}
446446
shell: bash

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,18 @@ All notable changes to this project will be documented in this file.
99
- Run a `containerdebug` process in the background of each Hive container to collect debugging information ([#554]).
1010
- Aggregate emitted Kubernetes events on the CustomResources ([#560]).
1111

12+
[#554]: https://github.com/stackabletech/hive-operator/pull/554
13+
[#560]: https://github.com/stackabletech/hive-operator/pull/560
14+
15+
## [24.11.1] - 2025-01-10
16+
1217
### Fixed
1318

1419
- BREAKING: Use distinct ServiceAccounts for the Stacklets, so that multiple Stacklets can be
1520
deployed in one namespace. Existing Stacklets will use the newly created ServiceAccounts after
1621
restart ([#544]).
1722

1823
[#544]: https://github.com/stackabletech/hive-operator/pull/544
19-
[#554]: https://github.com/stackabletech/hive-operator/pull/554
20-
[#560]: https://github.com/stackabletech/hive-operator/pull/560
2124

2225
## [24.11.0] - 2024-11-18
2326

0 commit comments

Comments
 (0)