Repository navigation
ci: remove the automatic release back-merge - #5179
Conversation
Fixes are cherry-picked from main onto release, and the maintainer merges release into main once before each semver release, as a merge commit with --admin. Drop the Back-merge workflow, its script and recipe, Check's land job, and the Alert entry, and update CONTRIBUTING and the quests. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info
WalkthroughThe pull request removes the automated release-to-main back-merge script, recipe, and workflows. Contributor guidance now describes a maintainer-triggered, non-squashed merge before a minor or breaking release. Quest documentation updates the squash merge queue requirements and removes the bot-workflow permission quest. Priority: ➖ Normal Merge Risk: ⚪ Minimal · up to The change replaces back-merge automation with a documented manual merge before minor or breaking releases. No established issue prevents merging. Pre-merge checks |
|
|
Merge summary:
(Written by Claude Opus 5.5) |
ci: remove the automatic release back-merge (backport #5179)
Problem
Every push to
releaseopens a PR mergingreleaseback intomain, landed by Check'slandjob as a moq-bot--adminmerge commit. That machinery needs a bot bypass on the planned squash queue, aworkflowspermission for moq-bot, and an unreviewed path past the queue. The maintainer decided (2026-10-10) it isn't worth it:Approach
.github/workflows/back-merge.yml,sh/gh/back-merge.sh, thejust gh back-mergerecipe, Check'slandjob, and theBack-mergeentry inalert.yml.CONTRIBUTING.md: fixes still land onmainand are cherry-picked ontorelease. Nothing mergesreleaseintomainautomatically; before a minor or breaking release, the maintainer mergesreleaseintomainonce, as a merge commit with--admin(the only allowed queue bypass), then cuts as today.quest/m1/bot-workflows-permission.md(moq-bot no longer pushes back-merges). Rewritequest/m1/merge-queue-settings.md: ruleset 2420853 still has nomerge_queuerule, so the squash queue stays pending, but the moq-botpull_requestbypass is dropped. Reword the back-merge note inquest/m0/broadcast-epoch/README.mdfor the manual pre-release merge.Ordering
Gate cleared: back-merge #5176 merged at 2026-10-10T05:33Z, and this branch now includes it (
mainmerged in).The backport removing release's copy of the workflow is #5180, against
release. Until it lands, a push toreleasestill opens a back-merge PR that nothing lands; close it, or fold it into the pre-release merge.Impact
Alternatives
workflowspermission: rejected by the maintainer.Follow-ups
quest/m1/merge-queue-settings.md: the maintainer still enables the squash queue onmain.(Written by Claude Opus 5.5)
🤖 Generated with Claude Code