Skip to content

Commit b1d5546

Browse files
committed
Merge branch 'main' into chore/harbor-migration
2 parents 3856209 + 61cddb0 commit b1d5546

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ All notable changes to this project will be documented in this file.
1010

1111
[#267]: https://github.com/stackabletech/listener-operator/pull/267
1212

13+
## [24.11.1] - 2025-01-10
14+
1315
## [24.11.0] - 2024-11-18
1416

1517
### Added

0 commit comments

Comments
 (0)