Skip to content

Merge a release's back-merge once TagBot has tagged the release - #65

Merged
CiaranOMara merged 1 commit into
developfrom
feature/auto-back-merge
Nov 3, 2026
Merged

CiaranOMara merged 1 commit into
developfrom
feature/auto-back-merge

Conversation

@CiaranOMara

Copy link
Copy Markdown
Member

With the input auto-merge, the back-merge workflow approves a release's back-merge as github-actions[bot] and merges it with the ReleaseFlow app's token, or RELEASEFLOW_TOKEN, once TagBot has tagged the release at the commit that the back-merge brings, GitHub's state of it is clean, and it doesn't conflict. It waits for the tag because the back-merge's merge commit may have the release's tree, which TagBot could otherwise tag instead of the release's commit. It runs on the caller's workflow_run of TagBot and of the required checks, and skips the other pull requests' checks; GitHub's auto-merge isn't used, so nothing else can merge itself.

Each run reports, in its notices and job summary, what each back-merge waits for, and names the setting or permission to change where approving or merging is refused; the README lists these under Troubleshooting the back-merge. This repository's own back-merges use it.

With the input `auto-merge`, the back-merge workflow approves a release's back-merge as github-actions[bot] and merges it with the ReleaseFlow app's token, or RELEASEFLOW_TOKEN, once TagBot has tagged the release at the commit that the back-merge brings, GitHub's state of it is clean, and it doesn't conflict.
It waits for the tag because the back-merge's merge commit may have the release's tree, which TagBot could otherwise tag instead of the release's commit.
It runs on the caller's `workflow_run` of TagBot and of the required checks, and skips the other pull requests' checks; GitHub's auto-merge isn't used, so nothing else can merge itself.

Each run reports, in its notices and job summary, what each back-merge waits for, and names the setting or permission to change where approving or merging is refused; the README lists these under Troubleshooting the back-merge.
This repository's own back-merges use it.
@CiaranOMara
CiaranOMara merged commit 6f573ff into develop Nov 3, 2026
9 checks passed
@CiaranOMara
CiaranOMara deleted the feature/auto-back-merge branch November 3, 2026 23:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant