ci: better "Merge my PR"

.github/workflows/merge-version-bump-pr.yml → .github/workflows/merge-my-pr.yml

@@ -1,12 +1,12 @@
-name: Merge Version Bump PR
+name: Merge my PR
 
 on:
   # Trigger the workflow when a comment is created on an issue or pull request
   issue_comment:
     types: [created]
 
 jobs:
-  merge-pr:
+  merge-version-bump-pr:
     # Only run if the comment is on a PR and the comment body matches exactly "Merge my PR"
     if: >-
       github.event.issue.pull_request &&
@@ -21,5 +21,25 @@ jobs:
       # Merge PRs from version-bump/X.Y.Z into main
       required-base-branch: 'main'
       head-branch-pattern: '^version-bump/[0-9]+\.[0-9]+\.[0-9]+$'
+      merge-method: 'squash'
+    secrets:
+      github-token: ${{ secrets.METAMASK_EXTENSION_BRANCH_SYNC_TOKEN }}
+
+  merge-stable-sync-pr:
+    # Only run if the comment is on a PR and the comment body matches exactly "Merge my PR"
+    if: >-
+      github.event.issue.pull_request &&
+      github.event.comment.body == 'Merge my PR' &&
+      (
+        github.event.comment.author_association == 'MEMBER' ||
+        github.event.comment.author_association == 'OWNER'
+      )
+    uses: MetaMask/github-tools/.github/workflows/merge-approved-pr.yml@v1
+    with:
+      pr-number: ${{ github.event.issue.number }}
+      # Merge PRs from stable-main-X.Y.Z into main
+      required-base-branch: 'main'
+      head-branch-pattern: '^stable-main-[0-9]+\.[0-9]+\.[0-9]+$'
+      merge-method: 'merge'
     secrets:
       github-token: ${{ secrets.METAMASK_EXTENSION_BRANCH_SYNC_TOKEN }}