From ed4e93c0d70098abf0d2e85bc69edc17ed52c8db Mon Sep 17 00:00:00 2001
From: Yuriy Andamasov <yuriy@vyos.io>
Date: Thu, 28 May 2026 13:15:16 +0300
Subject: mergify: T8935: gate merge on conflicts + invalid-title labels
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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).
---
 .mergify.yml | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index 7ba0f73..1ee98b7 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -297,5 +297,46 @@ merge_protections:
       - label = backport-conflict
     success_conditions:
       - label != backport-conflict
+
+  # Block merge while the `conflicts` label is set. The label is applied
+  # by the `Label conflicting pull requests` rule above (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). Either case must be resolved — by
+  # rebasing/merging the base, or by removing committed marker text —
+  # before merge can proceed. The script ignores PRs that already carry
+  # `backport-conflict` so the two labels stay disjoint in practice (see
+  # T8934).
+  - name: conflicts label must be absent to merge
+    description: >
+      Block merge while the conflicts label is present. The label is
+      auto-applied by the central `Label conflicting pull requests`
+      rule (git-level merge conflicts) and by
+      vyos/.github:scripts/check-pr-conflicts.py (committed conflict
+      markers on non-Mergify PRs). Must be cleared by resolving the
+      conflict.
+    if:
+      - label = conflicts
+    success_conditions:
+      - label != conflicts
+
+  # Block merge while the `invalid-title` label is set. The label is
+  # auto-toggled by the central `Flag T-ID format violation in PR title
+  # or commit messages` rule above when the PR title or any commit's
+  # first line does not match `[scope: ]T<digits>: <text>`. Promoting
+  # the existing label-only signal to a merge gate closes the gap where
+  # consumer repos that lacked a required `check-pr-message` status
+  # check could still merge a malformed PR.
+  - name: invalid-title label must be absent to merge
+    description: >
+      Block merge while the invalid-title label is present. The label
+      is auto-toggled by the `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>`. Must be cleared
+      by amending the offending title/commit headline.
+    if:
+      - label = invalid-title
+    success_conditions:
+      - label != invalid-title
 merge_protections_settings:
   reporting_method: check-runs
-- 
cgit v1.2.3