Skip to content

Fix code_freeze lane committing beta bump to wrong branch #2668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iangmaia merged 1 commit into from
Feb 25, 2026
Merged

Fix code_freeze lane committing beta bump to wrong branch #2668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions fastlane/Fastfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,13 @@ lane :code_freeze do |version:, skip_confirm: false, github_username: nil|

push_to_git_remote(set_upstream: true)

# Create backmerge PR from the release branch to MAIN_BRANCH so that the strings bundle is uploaded to GlotPress
create_backmerge_pr(source_branch: branch_name, github_username: github_username)

# Create the first beta (bumps version, commits, pushes, tags, triggers build)
new_beta_release(version: version, skip_confirm: skip_confirm)

# Create backmerge PR from the release branch to MAIN_BRANCH so that the pot strings bundle is uploaded to GlotPress once it hits trunk
# Important: this must come after new_beta_release because the backmerge action switches branches.
create_backmerge_pr(source_branch: branch_name, github_username: github_username)

UI.success("Code freeze complete! Created #{branch_name} with first beta")
end

Expand Down Expand Up @@ -311,7 +312,6 @@ lane :publish_release do |version:, skip_confirm: false, github_username: nil|
name: "v#{version}"
)

# Create backmerge PR with intermediate branch to handle conflicts
create_backmerge_pr(source_branch: release_branch, github_username: github_username)

Fastlane::Helper::GitHelper.delete_remote_branch_if_exists!(release_branch)
Expand Down