[CI] Automate the release step of merging the main branch to develop (#842)

Author: testableapple

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

@@ -0,0 +1,32 @@
+name: "Merge main to develop"
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  merge:
+    name: Merge
+    runs-on: ubuntu-latest
+    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^S05RBQ69U1H>, 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

@@ -26,11 +26,3 @@ jobs:
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
         run: bundle exec fastlane publish_release --verbose
-
-      - uses: 8398a7/action-slack@v3
-        with:
-          status: ${{ job.status }}
-          text: "🎉 The new release has been shipped! 🚢\n\n⚠️ <!subteam^S05RBQ69U1H>, don't forget to merge `main` back to `develop` from `localhost` using the command: `bundle exec fastlane merge_main`"
-          fields: repo
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

Gemfile.lock

@@ -26,15 +26,15 @@ GEM
     ast (2.4.3)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1112.0)
+    aws-partitions (1.1114.0)
     aws-sdk-core (3.225.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.103.0)
+    aws-sdk-kms (1.104.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-s3 (1.189.0)
@@ -163,7 +163,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.227.2)
+    fastlane (2.228.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -210,7 +210,7 @@ GEM
       bundler
       fastlane
       pry
-    fastlane-plugin-stream_actions (0.3.83)
+    fastlane-plugin-stream_actions (0.3.84)
       xctest_list (= 1.2.1)
     fastlane-plugin-versioning (0.7.1)
     fastlane-sirp (1.0.0)
@@ -287,7 +287,7 @@ GEM
     mutex_m (0.3.0)
     nanaimo (0.4.0)
     nap (1.1.0)
-    naturally (2.2.1)
+    naturally (2.2.2)
     netrc (0.11.0)
     nio4r (2.7.4)
     nkf (0.2.0)
@@ -345,7 +345,7 @@ GEM
       rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.45.0)
+    rubocop-ast (1.45.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-performance (1.19.1)
@@ -424,7 +424,7 @@ DEPENDENCIES
   fastlane
   fastlane-plugin-create_xcframework
   fastlane-plugin-lizard
-  fastlane-plugin-stream_actions (= 0.3.83)
+  fastlane-plugin-stream_actions (= 0.3.84)
   fastlane-plugin-versioning
   json
   plist

fastlane/Fastfile

@@ -105,6 +105,8 @@ 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

fastlane/Pluginfile

@@ -1,3 +1,3 @@
 gem 'fastlane-plugin-versioning'
 gem 'fastlane-plugin-create_xcframework'
-gem 'fastlane-plugin-stream_actions', '0.3.83'
+gem 'fastlane-plugin-stream_actions', '0.3.84'