Fix code_freeze lane committing beta bump to wrong branch#2668
Merged
Fix code_freeze lane committing beta bump to wrong branch#2668
Conversation
…ch checkout issue Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
sejas
approved these changes
Feb 25, 2026
Member
sejas
left a comment
There was a problem hiding this comment.
The code looks good to me. The build version should be beta now, instead of the previous version.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Relates to AINFRA-2108
Summary
create_backmerge_prafternew_beta_releasein thecode_freezelane to fix the beta version bump being committed to the backmerge branch instead of the release branchRoot cause
The
create_release_backmerge_pull_requestaction (from release-toolkit) creates amerge/release-X.Y.Z-into-trunkintermediate branch and leaves git HEAD checked out on it. Whennew_beta_releasesubsequently runsbump_version_commit_and_push, it commits the version bump to the backmerge branch instead of the release branch.The triggered build correctly targets
release/X.Y.Z, but that branch never receives the beta bump commit, so it builds the wrong version.Fix
Move
create_backmerge_prto afternew_beta_releaseincode_freeze. The backmerge action's branch switch no longer matters since it happens after the beta bump and build trigger.Pre-merge Checklist
🤖 Generated with Claude Code