From 9c8404a3cb6e1b5fb77571b24e85f13b0d327424 Mon Sep 17 00:00:00 2001
From: Mauro Romito <mauro.romito@element.io>
Date: Thu, 6 Mar 2025 12:59:00 +0100
Subject: [PATCH] fastlane: rebase main with develop after a release

moved the git fetch into the setup of xcode cloud

fix
---
 ci_scripts/ci_common.sh |  6 ++----
 fastlane/Fastfile       | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ci_scripts/ci_common.sh b/ci_scripts/ci_common.sh
index 7bf07af31..cf2a8b200 100755
--- a/ci_scripts/ci_common.sh
+++ b/ci_scripts/ci_common.sh
@@ -27,6 +27,8 @@ setup_xcode_cloud_environment () {
 
     bundle config path vendor/bundle
     bundle install --jobs 4 --retry 3
+    # Xcode Cloud shallow clones the repo. We need to deepen it to fetch tags, commit history and be able to rebase main on develop at the end of releases.
+    git fetch --unshallow --quiet
 }
 
 install_xcode_cloud_brew_dependencies () {
@@ -56,10 +58,6 @@ generate_what_to_test_notes() {
     if [[ -d "$CI_APP_STORE_SIGNED_APP_PATH" ]]; then
         TESTFLIGHT_DIR_PATH=TestFlight
         TESTFLIGHT_NOTES_FILE_NAME=WhatToTest.en-US.txt
-
-        # Xcode Cloud shallow clones the repo, we need to deepen it to fetch tags and commit history
-        # Instead of trying `--deepen=<depth>` just do a full unshallow to avoid future surprises
-        git fetch --unshallow --quiet
         
         LATEST_TAG=""
         if [ "$CI_WORKFLOW" = "Release" ]; then
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 88ceab0fa..70bf68553 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -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|