Infra-2925: add merging GitHub action #172

XxdpavelxX · 2025-11-21T14:41:36Z

Allows you to merge stable -> main PRs on comment "Merge my PR" in Mobile/Extension

Task: https://consensyssoftware.atlassian.net/browse/INFRA-2925
PAT token generated in: https://github.com/MetaMask/patroll/pull/25

Desired Successful test: consensys-test/metamask-mobile-test-workflow#53, https://github.com/consensys-test/metamask-mobile-test-workflow/actions/runs/19575307260

Note

Adds a reusable GitHub Actions workflow that merges stable-main-x.y.z PRs into main only after release-team approval.

CI/GitHub Actions:
- New workflow /.github/workflows/merge-approved-pr.yml:
  - Retrieves PR head/base branches via GitHub API.
  - Validates branch pattern: head stable-main-X.Y.Z -> base main.
  - Verifies at least one approval from release-team and no outstanding change requests.
  - Merges the PR using merge commits (no squash) when checks pass.

^{Written by Cursor Bugbot for commit 276dff9. This will update automatically on new commits. Configure here.}

Signed-off-by: Pavel Dvorkin <pavel.dvorkin@consensys.net>

.github/workflows/merge-approved-pr.yml

Mrtenz · 2025-11-21T14:57:29Z

If this is intended to be used by other repositories, can you add it as composite action instead?

cursor · 2025-11-21T15:27:40Z

.github/workflows/merge-approved-pr.yml

+              core.setFailed('Skipping: PR is not approved.');
+            } else {
+              console.log('PR approval check passed.');
+            }


Bug: Approval check fails job instead of skipping merge

The approval verification step calls core.setFailed() when a PR lacks approval, which fails the entire job. This is inconsistent with the branch verification step which gracefully handles mismatches by setting a should_skip output. When approval is missing, the job should skip the merge rather than fail, allowing the workflow to complete successfully without executing the merge step.

.github/workflows/merge-approved-pr.yml

gauthierpetetin

Thanks for this PR @XxdpavelxX , I left 2 comments

gauthierpetetin · 2025-11-25T15:11:56Z

.github/workflows/merge-approved-pr.yml

+              pull_number: ${{ inputs.pr-number }}
+            });
+
+            // Check if there is at least one review with the state 'APPROVED'


We should check that the review was done by a member of the release team: https://github.com/orgs/MetaMask/teams/release-team

Sounds good. Do you know if the release-team specified in code somewhere, or do we have an existing mechanism to get the release-team list in gh actions?

Requiring a release team review would be ideal (certainly we expect the release team to be the reviewer), but it does not seem critical here. We allow anybody to review sync PRs today, that can remain the case for now.

Does that sounds OK @gauthierpetetin ?

Oh nevermind, I see you found a way to do it, this looks good

I'm experimenting with a way. But will need to use a PAT token to test this since github auth tokens don't have read:org permissions to fetch team members

gauthierpetetin · 2025-11-25T15:23:03Z

.github/workflows/merge-approved-pr.yml

+            core.setOutput('base', pr.base.ref);
+            core.setOutput('head', pr.head.ref);
+
+      # Verify that the PR targets 'main' from 'stable'


We do not really merge 'stable' to 'main'.
Here are the different use cases where a merge commit is needed:

Stable sync to main (example)

head: stable-main-x.y.z

base: main

Stable sync to release branch (example)

head: sync-vx.y.z-with-stable

base: release/x.y.z

Release PR (example)

head: release/x.y.z

base: stable

Per the discussion in this ticket it sounded like we want to merge stable into main. https://consensyssoftware.atlassian.net/browse/INFRA-2925.

Maybe this was referring to the first, Stable sync example you posted? If the desired branch syntax is stable-main-x.y.z -> main I can update the naming convention in the PR. And does this apply to both Mobile and Extension? @gauthierpetetin

cc @Gudahtt @sethkfman

Gauthier is correct. We are kinda merging "stable" into "main", but we have to use an intermediary branch to resolve conflicts (and because merging between long-running branches directly is just confusing in the GitHub UI if you try to do it, it puts delete branch buttons in the PR that we really don't want for example).

This applies to both mobile and extension

We've used a few different names for this intermediary branch in the past, but using the format Gauthier listed sounds good to me. Presumably that's what the stable sync automation we already have uses.

Updated it to do stable-main-x.y.z -> main merges

Gudahtt · 2025-11-25T20:27:45Z

.github/workflows/merge-approved-pr.yml

@@ -0,0 +1,132 @@
+name: Merge Approved PR


Nit: Since this only handles the stable sync PR right now, we can make this a bit more specific.

Suggested change

name: Merge Approved PR

name: Merge Approved Stable Sync PR

Alternatively, maybe we could make this workflow more generic and allow passing in patterns for expected target and base branches?

We do need to handle syncs between two release PRs anyway, so that would better prepare for that work.

I wanted to start with passing specific branches and have that working. Then experiment and improve on that in the followup task. https://consensyssoftware.atlassian.net/browse/INFRA-3000 to see if it's better to make this more generic or keep it specific and perhaps in separate workflow.

.github/workflows/merge-approved-pr.yml

Gudahtt

Looks great! I had a couple of minor suggestions

Gudahtt

LGTM!

I still think the name isn't ideal for what the workflow currently does, but not a big deal

XxdpavelxX added 5 commits November 20, 2025 16:23

INFRA-2925: Moved merge action logic to github-tools

ccfa106

Signed-off-by: Pavel Dvorkin <pavel.dvorkin@consensys.net>

Testing without CR approved

018b4a8

INFRA-2925: Improved logging on merge action

8d3e117

INFRA-2925-Changed stable_test to stable in merge action

186d81c

INFRA-2925-Changed stable_test to stable in merge action

e257282

metamaskbot added the team-dev-ops label Nov 21, 2025

XxdpavelxX requested review from Gudahtt and sethkfman November 21, 2025 14:42

XxdpavelxX self-assigned this Nov 21, 2025

cursor bot reviewed Nov 21, 2025

View reviewed changes

.github/workflows/merge-approved-pr.yml Show resolved Hide resolved

.github/workflows/merge-approved-pr.yml Show resolved Hide resolved

.github/workflows/merge-approved-pr.yml Outdated Show resolved Hide resolved

INFRA-2925-Fixed AI code review issues

6560a14

XxdpavelxX changed the title ~~Infra 2925 add merging GitHub action~~ Infra-2925: add merging GitHub action Nov 21, 2025

INFRA-2925: stable_test merging allowed

f39559f

cursor bot reviewed Nov 21, 2025

View reviewed changes

XxdpavelxX added 2 commits November 21, 2025 10:36

INFRA-2925: Undo stable_test change

6b827ec

INFRA-2925: Linting fix

519e409

cursor bot reviewed Nov 24, 2025

View reviewed changes

.github/workflows/merge-approved-pr.yml Outdated Show resolved Hide resolved

INFRA-2925: Linting fix

ea8a5e9

cursor bot reviewed Nov 24, 2025

View reviewed changes

.github/workflows/merge-approved-pr.yml Outdated Show resolved Hide resolved

gauthierpetetin reviewed Nov 25, 2025

View reviewed changes

INFRA-2925: Code review changes

e056456

Gudahtt reviewed Nov 25, 2025

View reviewed changes

XxdpavelxX added 2 commits November 25, 2025 15:50

INFRA-2925:Added temporary release team for testing

017e1ac

INFRA-2925-Fixed code review suggestions

276dff9

Gudahtt approved these changes Nov 26, 2025

View reviewed changes

XxdpavelxX merged commit 30baa9d into main Nov 26, 2025
21 checks passed

XxdpavelxX deleted the INFRA-2925-AddMergingGithubAction branch November 26, 2025 19:06

Uh oh!

Infra-2925: add merging GitHub action #172

Infra-2925: add merging GitHub action #172

Uh oh!

Conversation

XxdpavelxX commented Nov 21, 2025 • edited by cursor bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Mrtenz commented Nov 21, 2025

Uh oh!

cursor bot Nov 21, 2025

Choose a reason for hiding this comment

Bug: Approval check fails job instead of skipping merge

Uh oh!

Uh oh!

Uh oh!

gauthierpetetin left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

XxdpavelxX Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

XxdpavelxX Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Gudahtt Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Gudahtt Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Gudahtt left a comment

Choose a reason for hiding this comment

Uh oh!

Gudahtt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

XxdpavelxX commented Nov 21, 2025 •

edited by cursor bot

Loading

XxdpavelxX Nov 25, 2025 •

edited

Loading

XxdpavelxX Nov 25, 2025 •

edited

Loading

Gudahtt Nov 25, 2025 •

edited

Loading

Gudahtt Nov 25, 2025 •

edited

Loading