Skip to content

Commit acfa498

Browse files
[CI] Update merge main to develop lane (#569)
1 parent cfcbb13 commit acfa498

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

fastlane/Fastfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ end
142142

143143
lane :merge_main_to_develop do
144144
if is_ci
145+
sh('git config --global user.name "Stream Bot"')
145146
sh('git reset --hard')
146147
else
147148
ensure_git_status_clean
@@ -150,10 +151,10 @@ lane :merge_main_to_develop do
150151
sh('git checkout main')
151152
sh('git pull origin main')
152153
sh('git checkout origin/develop')
153-
sh('git pull')
154+
sh('git pull origin develop')
154155
sh('git log develop..main')
155156
sh('git merge main')
156-
sh('git push')
157+
sh('git push origin develop')
157158
end
158159

159160
private_lane :appstore_api_key do

0 commit comments

Comments
 (0)