summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuriy Andamasov <yuriy@vyos.io>2026-08-04 23:47:06 +0300
committerYuriy Andamasov <yuriy@vyos.io>2026-08-04 23:47:06 +0300
commitf4f67312feb2cfa914c45349c019c7917fdb6e62 (patch)
treedf27bb418ca23bd50e192e0b45cd184154f4208b
parent45e30eda416944eff2157f77c0aeb8fc5279b87f (diff)
downloadshim-signed-nos-task-id.tar.gz
shim-signed-nos-task-id.zip
T9164: mergify: accept NOS- and legacy VD- Jira keys in task-id checknos-task-id
VD tracker project renamed to NOS (2026-07) - PR titles and commit headlines using the new NOS- key must stop being flagged invalid-task-id; legacy VD- keys stay accepted. Fleet replication of canary vyos/vyos-1x#5379, whose adversarial review tightened the regexes to ASCII [0-9] + literal-space. 🤖 Generated by [robots](https://vyos.io)
-rw-r--r--.github/mergify.yml14
1 files changed, 8 insertions, 6 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml
index 2196523..a639fda 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -22,10 +22,12 @@ pull_request_rules:
- name: Flag product T-ID format violation in PR title or commit messages
description: >
Product-repo convention: PR title and every commit's first line must
- match `T<digits>: <text>` (optional `scope: ` prefix). Relocated from
- the central config (T8966) so the T-ID convention is opt-in per product
- repo. Name is intentionally distinct from any central rule name so this
- stays additive (not an `extends:` override).
+ match a `T<digits>:`, `NOS-<digits>:` or legacy `VD-<digits>:` task key
+ followed by text (optional `scope: ` prefix). NOS is the renamed VD Jira
+ project (2026-07). Relocated from the central config (T8966) so the T-ID
+ convention is opt-in per product repo. Name is intentionally distinct
+ from any central rule name so this stays additive (not an `extends:`
+ override).
conditions:
- '-closed'
- '-merged'
@@ -33,10 +35,10 @@ pull_request_rules:
- 'author!=copilot-swe-agent'
- 'author!=vyosbot'
- or:
- - '-title~=^(([a-zA-Z0-9\-_.]+:\s)?)T\d+:\s+[^\s]+.*'
+ - '-title~=^(([a-zA-Z0-9\-_.]+:[ ])?)(T[0-9]+|NOS-[0-9]+|VD-[0-9]+):[ ]+[^\s]+.*'
- and:
- 'label!=legacy'
- - 'commits[*].commit_message~=^(?!(([a-zA-Z0-9\-_.]+:\s)?)T\d+:\s+[^\s]+).*'
+ - 'commits[*].commit_message~=^(?!(([a-zA-Z0-9\-_.]+:[ ])?)(T[0-9]+|NOS-[0-9]+|VD-[0-9]+):[ ]+[^\s]+).*'
actions:
label:
toggle: