INFRA-3187: Automate Merging Release Branch workflow

[XxdpavelxX]

---

Note

Adds a composite GitHub Action and script to auto-merge older release branches into a new release branch, favoring the destination on conflicts and pushing if changes occur.

• CI/CD:
  • New composite action /.github/actions/merge-previous-releases/action.yml:
    • Inputs: new-release-branch, github-token, optional github-tools-repository, github-tools-ref.
    • Checks out target release branch and tools repo; sets git user; runs merge script.
  • New script /.github/scripts/merge-previous-releases.sh:
    • Parses release/X.Y.Z versions, finds all older release branches, sorts them, and merges into NEW_RELEASE_BRANCH.
    • Uses -X ours to favor destination on conflicts; skips branches already merged; resolves remaining conflicts keeping destination; commits and pushes only if merges occurred.
    • Leaves source branches open; fails fast on errors.

^{Written by Cursor Bugbot for commit 22f3e41. 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.