Merge branch 'develop' into carthage

.github/workflows/publish-release.yml

@@ -18,6 +18,8 @@ jobs:
         with:
           ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
       - uses: actions/[email protected]
+        with:
+          fetch-depth: 0
       - name: Extract version from branch name (for release branches)
         if: startsWith(github.event.pull_request.head.ref, 'release/')
         run: |

fastlane/Fastfile

@@ -109,6 +109,8 @@ lane :publish_release do |options|
   )
 
   update_spm(version: options[:version])
+
+  merge_main_to_develop
 end
 
 lane :merge_release_to_main do
@@ -135,8 +137,11 @@ lane :merge_main_to_develop do
     ensure_git_status_clean
   end
 
-  sh('git checkout main && git pull')
-  sh('git checkout develop && git pull')
+  sh('git checkout main')
+  sh('git pull origin main')
+  sh('git checkout develop')
+  sh('git pull origin develop')
+  sh('git log develop..main')
   sh('git merge main')
   sh('git push')
 end