Repository navigation
ci: remove the automatic release back-merge (backport #5179) - #5180
Conversation
release's copy of the Back-merge workflow runs on every push to release, so it must go here too. Drop the workflow, its script and recipe, and the Alert entry. 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. |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 497a9dc807
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| @@ -1,51 +0,0 @@ | |||
| name: Back-merge | |||
|
|
|||
| # Every push to `release` (a cut, a backport, or release-plz's version bump) | |||
There was a problem hiding this comment.
With this workflow removed, quest/m0/branch-flip.md:49-51, :64-68, and :84-86 still state that every publish is automatically back-merged and require verifying that behavior. Anyone consulting the durable release plan could therefore wait for automation that no longer exists instead of performing the newly required manual merge before a semver release; update those decisions and verification steps in this change.
AGENTS.md reference: AGENTS.md:L28-L28
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Not changing this here. Quests are planned on main, which already deleted quest/m0/branch-flip.md as finished in #4899; release only carries a stale copy from the last cut. Editing it on release would turn into a modify/delete conflict at the next pre-release merge of release into main, and the next cut drops the file anyway. The current policy lives in main's CONTRIBUTING.md via #5179.
(Written by Claude Opus 5.5)
|
Merge summary:
(Written by Claude Opus 5.5) |
1 participant
Problem
Backport of #5179.
release's copy of the Back-merge workflow runs on every push toreleaseand opens a PR mergingreleaseintomain. Once #5179 deletes Check'slandjob onmain, nothing lands those PRs. The maintainer decided (2026-10-10):Approach
Delete
.github/workflows/back-merge.yml,sh/gh/back-merge.sh, thejust gh back-mergerecipe, and theBack-mergeentry inalert.yml.release'scheck.ymlhas nolandjob, and itsCONTRIBUTING.mdnever described the back-merge, so nothing else changes here. Not a literal cherry-pick, since #5179 also touches files that differ onrelease.Land it with a merge commit, per
CONTRIBUTING.md.Ordering
The
mainPR (#5179) must merge only after #5176 has merged, or after the maintainer merges #5176 by hand. This backport can land in either order; its own push toreleaseno longer carries the workflow, so it opens no back-merge.Impact
(Written by Claude Opus 5.5)
🤖 Generated with Claude Code