Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions hack/tools/release/notes/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,14 @@ func defaultBranchForNewTag(newTag semver.Version) string {
if len(newTag.Pre) == 0 {
// for new minor releases, use the release branch
return releaseBranchForVersion(newTag)
} else if len(newTag.Pre) == 2 && newTag.Pre[0].VersionStr == "rc" && newTag.Pre[1].VersionNum >= 1 {
// for the second or later RCs, we use the release branch since we cut this branch with the first RC
} else if len(newTag.Pre) == 2 && newTag.Pre[0].VersionStr == "rc" {
// for all RCs (including rc.0), we use the release branch so notes are generated
Copy link
Member

@sbueringer sbueringer Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this means we have to push the release branch before you can generate the release notes?

But the release branch and the release tag is only created by the release action after we merge the PR with the release notes?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a similar concern but I wasn't familiar with the release flow - Thanks for the insight.
I suppose this opens a discussion, looping in @chandankumar4

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The bug arose with generation of release notes for v1.10.0-rc.0 - This issue was added in the improvement board for release 1.13

// the same way: previous minor to release branch (not previous minor to main)
return releaseBranchForVersion(newTag)
}

// for any other pre release, we always cut from main
// this includes all beta releases and the first RC
// this includes all beta releases
return "main"
}

Expand Down
2 changes: 1 addition & 1 deletion hack/tools/release/notes/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func Test_defaultBranchForNewTag(t *testing.T) {
{
name: "first RC",
newVersion: "v1.6.0-rc.0",
want: "main",
want: "release-1.6",
},
{
name: "second RC",
Expand Down