Repository navigation
fix(ci): land.sh never leaves auto-merge on a PR it stops landing - #336
Merged
Merged
Conversation
…o-merge The ruleset holds a PR with an unresolved thread, and land.sh's wait loop only watched for merge, DIRTY, a moved main and failing checks, so a thread the reviewer opened after auto-merge went on (#258, 2026-10-26) stalled the train until the deadline. The loop now turns auto-merge off and exits 2 on a positive unresolved count; a failed query counts as none.
DrunkOnJava
enabled auto-merge (squash)
October 26, 2026 17:05
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. |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 7e6024334e
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
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".
DrunkOnJava
disabled auto-merge
October 26, 2026 17:55
…ling it A timeout or a failing check left auto-merge on, so the abandoned PR could merge while the train refreshed the next one (#298 review). A branch that strict up-to-date reports BEHIND now exits 8 for a real refresh instead of waiting out the deadline.
DrunkOnJava
changed the title
DrunkOnJava
enabled auto-merge (squash)
October 26, 2026 17:56
2 tasks done
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.
Summary
land.sh turns squash auto-merge on once Corpus is green, then waits. Several ways out of that wait either stalled the train or left auto-merge on a PR the train had moved past. Each is fixed here, and every unsuccessful exit after auto-merge went on now turns it off:
Spec reference
None; repository tooling (merge train, #298).
Test plan
bash -n tools/maintainer/train/land.sh.unresolvedand the threadcase: 0, empty, query-error JSON and12a→ keep waiting; 1, 99, 100 → hand back. Live repo: fix(census): settle the class-count shortfalls against AutoCAD's DXF export (#230) #296 (2 open) → hand back; feat(container): open and walk AC1012 (R13), pinned on 22 real drawings (#119) #323 and fix(entities): read TEXT, ATTRIB and ATTDEF as §20.4.3-§20.4.5 print them on every release (#226, #62) #258 (0) → keep waiting.gh pr merge --disable-autois the call land.sh already uses on DIRTY.Source-provenance declaration
Written for this repository; no external source consulted.