Skip to content

Fix code_freeze lane committing beta bump to wrong branch#2668

Merged
iangmaia merged 1 commit intotrunkfrom
iangmaia/fix-code-freeze-backmerge-order
Feb 25, 2026
Merged

Fix code_freeze lane committing beta bump to wrong branch#2668
iangmaia merged 1 commit intotrunkfrom
iangmaia/fix-code-freeze-backmerge-order

Conversation

@iangmaia
Copy link
Contributor

@iangmaia iangmaia commented Feb 25, 2026

Relates to AINFRA-2108

Summary

  • Move create_backmerge_pr after new_beta_release in the code_freeze lane to fix the beta version bump being committed to the backmerge branch instead of the release branch

Root cause

The create_release_backmerge_pull_request action (from release-toolkit) creates a merge/release-X.Y.Z-into-trunk intermediate branch and leaves git HEAD checked out on it. When new_beta_release subsequently runs bump_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_pr to after new_beta_release in code_freeze. The backmerge action's branch switch no longer matters since it happens after the beta bump and build trigger.

Pre-merge Checklist

  • Changes are tested locally

🤖 Generated with Claude Code

…ch checkout issue

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@iangmaia iangmaia self-assigned this Feb 25, 2026
@iangmaia iangmaia requested a review from sejas February 25, 2026 20:14
Copy link
Member

@sejas sejas left a comment

Choose a reason for hiding this comment

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

The code looks good to me. The build version should be beta now, instead of the previous version.

@iangmaia iangmaia merged commit fd6d5b6 into trunk Feb 25, 2026
11 checks passed
@iangmaia iangmaia deleted the iangmaia/fix-code-freeze-backmerge-order branch February 25, 2026 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants