fastlane: rebase main with develop after a release

moved the git fetch into the setup of xcode cloud

fix
This commit is contained in:
Mauro Romito
2025-03-06 12:59:00 +01:00
committed by Mauro
parent 7373eabffb
commit 9c8404a3cb
2 changed files with 20 additions and 4 deletions
+18
View File
@@ -280,6 +280,24 @@ lane :prepare_next_release do
sh("git commit -m 'Prepare next release'")
git_push()
rebase_main_onto_current_branch()
end
def rebase_main_onto_current_branch
# Capture the current branch name
current_branch = sh("git rev-parse --abbrev-ref HEAD").strip
UI.message("Current branch: #{current_branch}")
# Switch to main and update it
sh("git checkout main")
sh("git pull origin main")
sh("git rebase #{current_branch}")
git_push()
UI.success("Successfully rebased main onto #{current_branch}")
end
lane :tag_nightly do |options|