Repository navigation
fix(ci): queue approved pull requests on master - #166
Closed
systemfsoftware-maker wants to merge 1 commit into
Closed
systemfsoftware-maker wants to merge 1 commit into
systemfsoftware-maker wants to merge 1 commit into
Conversation
The org rule "Queue when approved" in systemfsoftware/.github matches base = main. This repository's default branch is master, so an approval never queued a PR; it needed a manual @Mergifyio queue comment. Add a rule of the same name with the org rule's conditions, base = master in place of base = main. Mergify keeps the local rule when both files name one, so the rest of the org policy still applies. `shared` anchors are not inherited, so the two the rule uses are copied locally.
Collaborator
Author
|
Closing: a copied rule drifts from the org file (the kiro_gate phase switch would leave this copy behind). The mismatch is fixed at the source in systemfsoftware/.github instead, so every repository whose default branch is not main is covered. |
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
An approved pull request in this repository now enters the merge queue without a
@Mergifyio queuecomment. The org rule that does this, "Queue when approved" insystemfsoftware/.github, matchesbase = main. This repo's default branch ismaster, so it never fired.What changed
.mergify.ymlgains a rule named "Queue when approved" whose conditions are the org rule's, verbatim, exceptbase = master. Mergify keeps the local rule when both files define one with the same name (see "Extending configuration files" in https://docs.mergify.com/configuration/sharing/), so it replaces the org rule here and the rest of the org policy still applies. I parsed the org file and this one with anchors resolved: the two rules are identical apart from the base condition.sharedis not inherited, so the two anchors the rule uses (kiro_gate,not_queue_branch) are copied locally with the org file's current values. The branch is not renamed and the org file is not touched.Order with #165
Merge #165 first. Until it lands,
actionlint + version surfacesis not reported, so a queued PR still waits on that condition.Unapplied review findings
.mergify.yml:5— The org file has a phase switch forkiro_gate(approval bykiro-systemf[bot]now,check-success = @kiro-systemf/review-gatelater). When it flips, this repo's copy stays on phase 1 and the two drift silently. Only the comment at that line guards it. A CI step that compares the anchors with the live org file would catch it, but adds a gate, which needs operator sign-off..mergify.yml:13— Same ordering point as above:queue_conditionsnamesactionlint + version surfaces, which exists only once fix(ci): restore the version and mode checks #155 dropped #165 merges.Residual risk, inferred and not tested: Mergify reads
pull_request_rulesfrom the base branch, so approving this PR will not queue it. It needs one manual@Mergifyio queue.Testing
cargo fmt --check,cargo clippy --all-targets -- -D warnings,cargo test --all-targetspass locally. Mutation was not run: no classifier change.Configuration changedcheck on this head, which validates the new config against the app. Nothing local runs it.20261111-015121-2650e7a1, artifactadversarial-mergify.json, no P0 or P1).