[CI] Update merge main to develop lane (#569)

GetStream · Jul 31, 2024 · acfa498 · acfa498
1 parent cfcbb13
commit acfa498
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -142,6 +142,7 @@ end
 
 lane :merge_main_to_develop do
   if is_ci
+    sh('git config --global user.name "Stream Bot"')
     sh('git reset --hard')
   else
     ensure_git_status_clean
@@ -150,10 +151,10 @@ lane :merge_main_to_develop do
   sh('git checkout main')
   sh('git pull origin main')
   sh('git checkout origin/develop')
-  sh('git pull')
+  sh('git pull origin develop')
   sh('git log develop..main')
   sh('git merge main')
-  sh('git push')
+  sh('git push origin develop')
 end
 
 private_lane :appstore_api_key do