Repository navigation
fix(ci): report a conflicting PR instead of failing the recheck on main - #696
Conversation
A branch that conflicts with the base cannot be updated or merged, and the push that resolves the conflict runs every current gate. Count only GitHub's settled conflict verdict for the head the update tried as a skip; an unknown verdict, moved head or failed read stays a failure. Fixes #695 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@codex review |
Codex Review Summary: ✅ CompletedThis 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. |
|
Codex Review: Didn't find any major issues. What shall we delve into next? Reviewed commit: ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
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". |
@codex review |
|
Codex Review: Didn't find any major issues. Nice work! Reviewed commit: ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
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". |
Ready at head
|
Fixes #695.
What changed
scripts/recheck-open-prs.sh: when the head-checkedupdate-branchcall fails, the script reads the PR once. If GitHub reportsmergeable: falseandmergeable_state: dirtyfor the same head the update tried, the PR is listed as skipped and the run adds a::notice::. It no longer counts as a failure. Any other result (unknown or computing verdict, moved head, failed read) is still a failure, as before.scripts/recheck-open-prs-base-refresh.test.sh: four new hermetic cases. A settled conflict exits 0 with no close, reopen, merge or CI wait. A computing verdict, a moved head and a failed read each still exit 1 with the original error.docs/validation.md: documents the skip and the conditions for it.Why this is safe
A conflicting PR cannot merge, so its stale pre-gate green cannot reach
main. The push that resolves the conflict is a new head, and its ownpull_requestevent runs every current gate.Validation
bash scripts/recheck-open-prs-base-refresh.test.sh: all cases pass, including the four new ones.bash scripts/recheck-open-prs.test.sh: passes.shellcheckon both changed scripts: clean../scripts/validate-manifests.sh: passes.scripts/recheck-open-prs-observations.test.shshows 2 failures locally on macOS. The same 2 failures occur withmain's unmodified script, so they come from the local environment, not this change. CI runs it on Linux.