Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
testableapple committed Jul 31, 2024
1 parent 56e9f24 commit 0affee0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ lane :merge_release_to_main do
UI.user_error!("`#{release_branch}`` branch does not match the release branch pattern: `release/*`") unless release_branch.start_with?('release/')

sh('git checkout origin/main')
sh('git pull')
sh('git pull origin main')

# Merge release branch to main. For more info, read: https://notion.so/iOS-Branching-Strategy-37c10127dc26493e937769d44b1d6d9a
sh("git merge #{release_branch} --ff-only")
sh('git push')
sh('git push origin HEAD:main')
UI.important('Please, wait for the `Publish new release` workflow to pass on GitHub Actions: ' \
"https://github.com/#{github_repo}/actions/workflows/publish-release.yml")
end
Expand All @@ -147,11 +147,11 @@ lane :merge_main_to_develop do

sh('git checkout main')
sh('git pull origin main')
sh('git checkout develop')
sh('git checkout origin/develop')
sh('git pull origin develop')
sh('git log develop..main')
sh('git merge main')
sh('git push')
sh('git push origin HEAD:develop')
end

desc 'Compresses the XCFrameworks into zip files'
Expand Down

0 comments on commit 0affee0

Please sign in to comment.