Skip to content

Commit 0ad97fe

Browse files
[CI] Add merge_main_to_develop lane (#529)
1 parent 493f534 commit 0ad97fe

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

fastlane/Fastfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,19 @@ lane :merge_release_to_main do
116116
"https://github.com/#{github_repo}/actions/workflows/publish-release.yml")
117117
end
118118

119+
lane :merge_main_to_develop do
120+
if is_ci
121+
sh('git reset --hard')
122+
else
123+
ensure_git_status_clean
124+
end
125+
126+
sh('git checkout main && git pull')
127+
sh('git checkout develop && git pull')
128+
sh('git merge main')
129+
sh('git push')
130+
end
131+
119132
private_lane :appstore_api_key do
120133
@appstore_api_key ||= app_store_connect_api_key(
121134
key_id: 'MT3PRT8TB7',

0 commit comments

Comments
 (0)