From c56e6ef962104459f16ce3d031211ef32ed23d4d Mon Sep 17 00:00:00 2001 From: Ian Maia Date: Wed, 25 Feb 2026 21:13:58 +0100 Subject: [PATCH] Move backmerge PR creation after beta bump in code_freeze to fix branch checkout issue Co-Authored-By: Claude Opus 4.6 --- fastlane/Fastfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index daf82ffc41..71690823c4 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -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 @@ -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)