INFRA-3187: Automate Merging Release Branch workflow

[XxdpavelxX]

---

Note

Adds a composite GitHub Action and Bash script to automatically merge all older release/* branches into a newly created release branch, favoring the new branch on conflicts and pushing if merges occur.

• CI/GitHub Actions:
  • New composite action /.github/actions/merge-previous-releases/action.yml to merge previous release/* branches into a new release branch.
  • Checks out target branch and tools repo, configures git user, and runs merge script with provided inputs.
• Script:
  • New /.github/scripts/merge-previous-releases.sh:
    • Parses release/X.Y.Z, enumerates older release branches, sorts them, and merges into the new branch.
    • Skips branches already merged; uses -X ours to favor destination on conflicts and resolves remaining conflicts programmatically.
    • Commits merges, excludes github-tools from staging, and pushes only if any merges occurred.

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

Testing:
consensys-test/metamask-mobile-test-workflow#59

1. Multiple branches, one already merged: https://github.com/consensys-test/metamask-mobile-test-workflow/actions/runs/20072233678
2. Multiple branches, neither merged: https://github.com/consensys-test/metamask-mobile-test-workflow/actions/runs/20073029520
3. Multiple branches, with merge conflicts: https://github.com/consensys-test/metamask-mobile-test-workflow/actions/runs/20073136324

[Mrtenz]

This will check out the main branch of github-tools, which is prone to breaking. Please change this workflow to an action instead, and use this pattern:

github-tools/.github/actions/check-changelog/action.yml

Lines 20 to 27 in 1036dfd

	github-tools-repository:
	description: 'The GitHub repository containing the GitHub tools. Defaults to the GitHub tools action repositor, and usually does not need to be changed.'
	required: false
	default: ${{ github.action_repository }}
	github-tools-ref:
	description: 'The SHA of the action to use. Defaults to the current action ref, and usually does not need to be changed.'
	required: false
	default: ${{ github.action_ref }}

github-tools/.github/actions/check-changelog/action.yml

Lines 65 to 71 in 1036dfd

	- name: Checkout GitHub tools repository
	if: ${{ steps.label-check.outputs.skip_check != 'true' }}
	uses: actions/checkout@v6
	with:
	repository: ${{ inputs.github-tools-repository }}
	ref: ${{ inputs.github-tools-ref }}
	path: ./.github-tools

[XxdpavelxX]

Done

[Mrtenz]

Is this workflow necessary now? The action can be called from other repositories directly.

[XxdpavelxX]

Good call. I removed the workflow

[cursor]

Bug: Workflow references feature branch that will be deleted

The workflow references the action using @INFRA-3187-AutomateMergingReleaseBranches, which is a feature branch name. Once this PR is merged, this branch will likely be deleted, causing the workflow to fail when it tries to fetch the action. This aligns with the reviewer comment from @Mrtenz who noted that referencing the main branch is "prone to breaking" and suggested using a proper versioning pattern with github.action_repository and github.action_ref.

 

[XxdpavelxX]

This was in the workflow and has been removed

[Mrtenz]

Action looks good to me. I don't have context on the script itself, so will let someone else review that!

Fixed.

[HowardBraham]

Do we want this to be metamaskbot?

[XxdpavelxX]

You're right, these are just used for commit metadata, but let me update it to metamaskbot like our other workflows. Fixed

[cursor]

Bug: Delete/modify conflicts may cause script failure

When resolving merge conflicts, git checkout --ours "$file" will fail if the file was deleted in the destination branch ("ours") but modified in the source branch. Git reports "error: path does not have our version" and exits with non-zero status. With set -e enabled, this causes the entire script to abort instead of gracefully handling the conflict by keeping the deletion. This affects modify/delete conflicts that aren't resolved by the initial git merge -X ours command.

 

[XxdpavelxX]

Fixed