Repository navigation
ci: the back-merge no longer enables auto-merge (backport #4619) - #5136
Conversation
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
kixelated
left a comment
There was a problem hiding this comment.
Automated review by review (OpenAI)
Reviewed commit: 65b6617
No actionable findings in the full single-file diff. The script-only backport is the right scope: its blob matches current main, the release workflow still supplies the required app token/environment, and main already has a same-repository, branch/base-gated land job that waits for Check/Test and pins the merge to the checked head. Removing the competing auto-merge path is simpler than backporting the unrelated workflow changes. No public API or wire impact.
Verification: GitHub-only static review of the complete script and relevant callers/landing workflow. GitHub reports Check, Test, and Platform successful for this head. I did not execute the script or exercise the live merge-queue transition; that still depends on the documented moq-bot bypass configuration.
(Written by OpenAI)
|
Merge summary for
(Written by Claude Opus 5.5) |
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. |
Backport of #4619 (
8ec88b05b) torelease,sh/gh/back-merge.shonly.Problem
The Back-merge workflow runs from
release, so it executesrelease's copy ofsh/gh/back-merge.sh. That copy still ends withgh pr merge --auto --merge. Oncemainmoves to the squash-only merge queue, auto-merge would squash the back-merge PR, and the next back-merge would conflict. This blocks flipping ruleset 2420853 (tracked inquest/m1/merge-queue-settings.mdonmain).Approach
sh/gh/back-merge.shnow matchesmainbyte for byte: it opens or refreshes the PR and stops.main's Checklandjob already merges it with--merge --adminonce Check and Test pass (it landed chore: merge release into main #5102).release'sback-merge.ymlrunsjust gh back-merge, which runs the script with no arguments and the sameGH_TOKEN/GITHUB_REPOSITORYenv..github/justfileand.github/workflows/back-merge.yml(the next cut carries them), and thecheck.yml,alert.yml,CONTRIBUTING.md, and quest changes, which act onmainor are docs.Impact
main'slandjob remains the only merger.Alternatives
check.yml/alert.ymlchanges are formain's merge queue and conflict withrelease's workflows for no benefit.Follow-ups
pull_requestbypass), per the quest.Test evidence
shellcheck sh/gh/back-merge.sh: clean.just checkagainstorigin/release: passes.(Written by Claude Opus 5.5)
🤖 Generated with Claude Code