Skip to content

fix(merge): no self-armed merges; tri merges only what a reviewer bee passed #1242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gHashTag merged 2 commits into from
Oct 2, 2026
Merged

fix(merge): no self-armed merges; tri merges only what a reviewer bee passed #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6abc089
fix(merge): no self-armed merges; tri merges only what a reviewer bee…
gHashTag Oct 2, 2026
f8ec055
fix(github_client): date the head by its arrival, read every events p…
gHashTag Oct 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions .github/workflows/t27-world-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,13 @@ jobs:
# against the head it reads from the API, as it would for a person.
gh workflow run pr-blog-report.yml --ref main -f pr="$PR"
echo "- started the work-report check for PR #$PR" >> "$GITHUB_STEP_SUMMARY"
# Auto-merge lands it once "T27 work report" goes green. Without the
# repository setting it stays an open pull request for a person to
# merge, which is a worse outcome but not a failed run.
if ! gh pr merge "$PR" --squash --auto; then
echo "- auto-merge unavailable; PR #$PR is open and waiting" >> "$GITHUB_STEP_SUMMARY"
fi
# NO SELF-ARMED MERGE. Owner's rule, 2026-10-02: "the Queen must not
# merge by herself!! the Queen only manages!" -- no automation merges
# on its own verdict. This job used to arm `gh pr merge --squash
# --auto` on the pull request it had just opened, so its own green
# check was the merge. Now the refresh stays open for a reviewer bee:
# an APPROVED review plus the `bee-reviewed` label added after the
# head commit (the gate of gHashTag/t27#5526). If an earlier run left
# auto-merge armed, take it back -- a new head is unreviewed code.
gh pr merge "$PR" --disable-auto >/dev/null 2>&1 || true
echo "- PR #$PR is open and waits for a reviewer bee (bee-reviewed); this job does not merge it" >> "$GITHUB_STEP_SUMMARY"
Loading
Loading