diff options
| author | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-28 13:15:16 +0300 |
|---|---|---|
| committer | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-28 13:15:16 +0300 |
| commit | ed4e93c0d70098abf0d2e85bc69edc17ed52c8db (patch) | |
| tree | b0207d48c94e8d5c5be3bd4f9d7c40b0bf250a6f /.github | |
| parent | 4ad9a97f129255138325643cd8dd0da3b0ee44ab (diff) | |
| download | mergify-ed4e93c0d70098abf0d2e85bc69edc17ed52c8db.tar.gz mergify-ed4e93c0d70098abf0d2e85bc69edc17ed52c8db.zip | |
mergify: T8935: gate merge on conflicts + invalid-title labels
Promote two existing auto-applied labels from informational to
merge-blocking via Mergify merge_protections, mirroring the existing
backport-conflict gate:
- `conflicts` — applied by the central `Label conflicting pull
requests` rule (Mergify's built-in `conflict` attribute = GitHub's
`mergeable_state == "dirty"`) and by
vyos/.github:scripts/check-pr-conflicts.py (committed conflict
markers on non-Mergify PRs).
- `invalid-title` — auto-toggled by the central `Flag T-ID format
violation in PR title or commit messages` rule when the PR title or
any commit's first line does not match `[scope: ]T<digits>: <text>`.
Both labels were applied but did not block merge unless the consumer
repo had a corresponding required-status-check or branch-protection
ruleset. This change makes the central baseline enforce the gate via
Mergify's merge_protections, with per-repo override available via
same-named child rule (per Mergify `extends:` inheritance semantics).
Verified via /mergify-config-check (all six known schema/keyword
gotchas PASS) and Phase 0 local CodeRabbit (clean).
Diffstat (limited to '.github')
0 files changed, 0 insertions, 0 deletions