feat(ci): bot-review auto-approve + auto-merge when clean#83
Merged
Conversation
Phase 2 promotion: bot-review now approves and enables auto-merge on PRs that pass all gates. Escape hatches: 'no-auto-merge' label or '[no-auto-merge]' in title. Gates (ALL must hold): - PR author is internal SymbolStar org member (fork PRs never auto-merge) - zero red-line findings (A-7.5, SSE order, forge restart race) - zero 'needs human review' path hits (server.py, migrations/, bin/forge, .github/workflows/, *.plist, forge_xiaof.py) - no 'no-auto-merge' label, no '[no-auto-merge]' in title Uses squash merge. Falls back to direct squash if 'Allow auto-merge' is not enabled at repo level (warns in logs). Pairs with branch protection on main to wait for required CI.
🤖 bot-review (comment-only · phase 1)Diff: Red-line checks:
Needs human review — these paths are not eligible for future auto-approve:
Phase 2: auto-approve + auto-merge fire only when red-lines are clean, author is internal, and no needs-human path is touched. Block with |
1effe20 to
7c1a0bd
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Promote
bot-review.ymlfrom Phase 1 (comment-only) → Phase 2 (auto-approve + auto-merge) for PRs that pass all red-line gates.Gates (ALL must hold)
server.py,migrations/,bin/forge,.github/workflows/,*.plist,forge_xiaof.py)no-auto-mergelabel, no[no-auto-merge]in titleEscape hatches
no-auto-mergeon PR[no-auto-merge]in PR titleRepo settings Scott needs to flip (one-time)
main:cijob(s)no-auto-merge(color: red)Without #1/#2 the workflow still works but falls back to direct squash merge (warns in logs).