diff options
| author | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-26 09:13:56 +0300 |
|---|---|---|
| committer | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-26 09:13:56 +0300 |
| commit | f7980601779c2ccfc08fcdb657a25ad49f98cf2e (patch) | |
| tree | 1af95f555f0d6e9436620434586af134dfd83dfe | |
| parent | d8946ff8911c9c2bb88ddbecbccec76505674150 (diff) | |
| download | mirror-canary-f7980601779c2ccfc08fcdb657a25ad49f98cf2e.tar.gz mirror-canary-f7980601779c2ccfc08fcdb657a25ad49f98cf2e.zip | |
fix(canary): move Mergify config to .github/mergify.yml (org convention)
Mergify check-suite stuck queued with 0 check-runs after we added the
config at .mergify.yml (root). Empirically, this org's prod consumers use
.github/mergify.yml and Mergify processes those correctly. Move the
canary config to the same path + add merge_protections_settings.reporting_method
to match prod convention exactly.
Plan: ~/.claude/plans/2026-05-26-mirror-rollout-1a-expanded-canary-tests.md A.3 (fixed mid-execution after A.4.3 stall)
| -rw-r--r-- | .github/mergify.yml | 9 | ||||
| -rw-r--r-- | .mergify.yml | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 0000000..6faffd8 --- /dev/null +++ b/.github/mergify.yml @@ -0,0 +1,9 @@ +# yaml-language-server: $schema=https://docs.mergify.com/configuration/file-format/ +# Mergify configuration for vyos/mirror-canary (Rollout 1a canary). +# Inherits the central baseline from vyos/mergify:.mergify.yml via extends:. +# Matches the production-consumer convention at .github/mergify.yml (the root +# .mergify.yml path is documented but not picked up by Mergify on this org's +# repos — empirically verified during 1a expansion). +extends: mergify +merge_protections_settings: + reporting_method: check-runs diff --git a/.mergify.yml b/.mergify.yml deleted file mode 100644 index dc315de..0000000 --- a/.mergify.yml +++ /dev/null @@ -1,4 +0,0 @@ -# .mergify.yml — Rollout 1a canary -# Inherits the org-level central Mergify configuration via extends:. -# Same shape as production consumer repos in the vyos org. -extends: mergify |