Skip to content

fix(ci): merge via REST when gh's client-side precheck refuses #286

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
github-actions merged 1 commit into from
Aug 7, 2026
Merged

fix(ci): merge via REST when gh's client-side precheck refuses #286

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 26 additions & 3 deletions scripts/ci/auto-merge-sweep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,11 +361,34 @@ INNER_EOF
# Deliberately still followed by `break`: at most one PR per sweep is ever
# handed to auto-merge, which keeps the one-car-per-sweep discipline even
# though GitHub, not this script, completes the merge.
echo "[auto-merge] #${number} direct merge refused (${mergeable}/${state}) — delegating to native auto-merge" >&2
if gh pr merge "$number" --repo "$REPO" --squash --delete-branch --auto; then
echo "[auto-merge] #${number} handed to native auto-merge; GitHub will complete it"
echo "[auto-merge] #${number} direct merge refused (${mergeable}/${state}) — trying the REST merge endpoint" >&2

# Why a second, lower-level attempt.
#
# `gh pr merge` refuses CLIENT-SIDE whenever GraphQL reports
# mergeStateStatus=BLOCKED to the caller. That status is computed per
# viewer, and GITHUB_TOKEN sees BLOCKED for PRs this same sweep reads as
# MERGEABLE — and that a PAT reads as CLEAN. Enabling native auto-merge
# goes through the same precheck and is refused identically.
#
# The REST merge endpoint has no such precheck: it enforces the branch's
# ACTUAL protection rules. On this repo those are empty (protection exists
# with every option disabled, no rulesets, no required checks, no required
# reviews), so a merge the API is willing to perform should not be blocked
# by a status that only describes what one viewer is allowed to predict.
#
# If GitHub genuinely refuses, this returns non-2xx and we fall through —
# the PR is left for the next sweep exactly as before. Nothing here forces
# a merge past a real rule.
if gh api -X PUT "repos/${REPO}/pulls/${number}/merge" \
-f merge_method=squash >/dev/null 2>&1; then
merged_any=1
echo "[auto-merge] #${number} merged via the REST endpoint"
gh api -X DELETE "repos/${REPO}/git/refs/heads/$(gh pr view "$number" --repo "$REPO" --json headRefName --jq .headRefName)" >/dev/null 2>&1 \
|| echo "[auto-merge] #${number} merged but its branch could not be deleted" >&2
break
fi

echo "[auto-merge] #${number} merge failed — leaving for the next sweep" >&2
fi
done
Expand Down
Loading