From fae4100e4d4dd268e8d3173123f2747ed6cf2860 Mon Sep 17 00:00:00 2001
From: Yuriy Andamasov <yuriy@vyos.io>
Date: Wed, 13 May 2026 22:52:58 +0300
Subject: ci(mergify): fix T-ID-override rule name to match central baseline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The override shipped in 3d44fe06 used rule names `Flag PR title not
matching T-ID format` + `Flag commit message not matching T-ID format`.
Per Mergify `extends:` semantics, same-name rules in the child REPLACE
the parent's — and the central baseline in vyos/mergify uses a single
rule named `Flag T-ID format violation in PR title or commit messages`.
Different names → no replacement → parent rule keeps firing.

Symptom (surfaced on PR #2014, title `docs(readme): …`): every PR
without a `T<digits>:` token gets `invalid-title` labeled.

Fix: collapse to one rule, rename to match the parent exactly. The
condition (`closed AND -closed`) still never matches, so `toggle`
removes the label on every evaluation — picks up any stale
`invalid-title` from the broken-override window.

The parent rule does not toggle `invalid-commit-title`; the
second child rule for that label was extraneous and is dropped.

🤖 Generated by [robots](https://vyos.io)

(cherry picked from commit ee2942a39e11b8d7996ba2f7f3ac53545300d647)
---
 .github/mergify.yml | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

(limited to '.github')

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 8dc66929..26e41c03 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -34,17 +34,23 @@ pull_request_rules:
   # noise.
   #
   # Per Mergify `extends:` semantics, same-name rules in the child REPLACE
-  # the parent's. The two rules below keep the original names so the parent
-  # versions are dropped; conditions are constructed to never match (a PR
-  # cannot simultaneously be closed and not closed), so the `toggle` action
-  # always falls into the "remove label" branch — cleaning up the labels on
-  # any PR that previously had them.
+  # the parent's. The override below MUST use the parent's exact rule name
+  # — `Flag T-ID format violation in PR title or commit messages` — or the
+  # parent rule keeps firing and `invalid-title` labels every PR. (The
+  # earlier two-rule override shipped in 3d44fe06 used the wrong names
+  # and was a no-op; PR #2014 surfaced the regression.)
+  #
+  # Conditions are constructed to never match (a PR cannot simultaneously
+  # be closed and not closed), so the `toggle` action always falls into
+  # the "remove label" branch — cleaning up `invalid-title` on any PR
+  # that picked it up while the broken override was in place.
   # ------------------------------------------------------------------
 
-  - name: Flag PR title not matching T-ID format
+  - name: Flag T-ID format violation in PR title or commit messages
     description: >
       Disabled in vyos-documentation — this repo does not require Phorge
-      T-IDs in PR titles. Conventional-commits style is acceptable.
+      T-IDs in PR titles or commit message headlines. Conventional-commits
+      style (`fix(ext): …`, `ci(...): …`, `chore(deps): …`) is acceptable.
     conditions:
       - closed
       - '-closed'
@@ -52,16 +58,3 @@ pull_request_rules:
       label:
         toggle:
           - invalid-title
-
-  - name: Flag commit message not matching T-ID format
-    description: >
-      Disabled in vyos-documentation — this repo does not require Phorge
-      T-IDs in commit message headlines. Conventional-commits style is
-      acceptable.
-    conditions:
-      - closed
-      - '-closed'
-    actions:
-      label:
-        toggle:
-          - invalid-commit-title
-- 
cgit v1.2.3