[CI] Merge main to develop after release on the same workflow run (#948)

Author: testableapple

.github/workflows/merge-main-to-develop.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  merge-comment:
+  merge-release-to-main:
     name: Merge release to main
     runs-on: macos-15
     if: github.event_name == 'workflow_dispatch' || (github.event.issue.pull_request && github.event.issue.state == 'open' && github.event.comment.body == '/merge release')

.github/workflows/release-merge.yml

@@ -26,3 +26,28 @@ jobs:
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
         run: bundle exec fastlane publish_release --verbose
+
+  merge-main-to-develop:
+    name: Merge main to develop
+    runs-on: ubuntu-latest
+    needs: release
+    steps:
+      - uses: actions/[email protected]
+        with:
+          token: ${{ secrets.ADMIN_API_TOKEN }}
+          fetch-depth: 0
+
+      - uses: ./.github/actions/ruby-cache
+
+      - run: bundle exec fastlane merge_main
+        env:
+          GITHUB_TOKEN: ${{ secrets.ADMIN_API_TOKEN }}
+
+      - uses: 8398a7/action-slack@v3
+        if: failure()
+        with:
+          status: ${{ job.status }}
+          text: "⚠️ <!subteam^S030AAHLDLN>, the merge of `main` to `develop` failed on CI. Consider using this command locally: `bundle exec fastlane merge_main`"
+          fields: repo,commit,author,workflow
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/release-publish.yml

@@ -143,8 +143,6 @@ lane :publish_release do |options|
   )
 
   update_spm(version: release_version)
-
-  sh('gh workflow run merge-main-to-develop.yml --ref main')
 end
 
 lane :get_sdk_version_from_environment do