Repository navigation
fix(ci-status): report conflicting instead of waiting on a PR GitHub won't build - #104
Merged
Merged
Conversation
…won't build GitHub runs no pull_request workflows on a PR that conflicts with its base, so ccm-ci-status --watch waited out ci_timeout_minutes as not-registered and auto-ticket parked with "CI never registered" (AIE-351). When nothing has registered, the script now re-reads mergeability and returns conflicting (exit 6); auto-ticket stops with the conflict as the reason, and finish-ticket and merge treat it as the gate's conflict blocker.
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.
ccm-ci-statusnow returnsconflicting(exit 6) when nothing has registered for the head commit and the PR isCONFLICTING. GitHub can't build the merge ref for such a PR, so itspull_requestworkflows never start. Before this,--watchwaited the fullci_timeout_minutesandauto-ticketparked with "CI never registered", which hid the cause (AIE-351, aiemailpoc PR #881).Changes:
bin/ccm-ci-status: re-readsmergeablein the not-registered path, so it costs one extraghcall there and none when checks exist. It re-reads each poll because mergeability is oftenUNKNOWNright after a push.skills/auto-ticket/SKILL.md4c:conflicting→ route-and-stop with the conflict as the reason.skills/finish-ticket,skills/merge, README: list the status and say not to wait on it.tests/run.sh: snapshot, watch, and with-checks cases. The snapshot case fails without the script change, and the watch case hangs until the call window ends.tests/every-ticket-since-baseline.diffregenerated for the skill edits. Version 3.20.4.bash tests/run.sh: 388 passed, 0 failed.