Skip to content

Commit 9365a9d

Browse files
authored
Merge pull request #5379 from vyos/nos-task-id
T9164: mergify: accept NOS- and legacy VD- Jira keys in task-id check
2 parents dcea666 + 68ae3c7 commit 9365a9d

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

.github/mergify.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,23 @@ pull_request_rules:
3333
- name: Flag product T-ID format violation in PR title or commit messages
3434
description: >
3535
Product-repo convention: PR title and every commit's first line must
36-
match `T<digits>: <text>` (optional `scope: ` prefix). Relocated from
37-
the central config (T8966) so the T-ID convention is opt-in per product
38-
repo. Name is intentionally distinct from any central rule name so this
39-
stays additive (not an `extends:` override).
36+
match a `T<digits>:`, `NOS-<digits>:` or legacy `VD-<digits>:` task key
37+
followed by text (optional `scope: ` prefix). NOS is the renamed VD Jira
38+
project (2026-07). Relocated from the central config (T8966) so the T-ID
39+
convention is opt-in per product repo. Name is intentionally distinct
40+
from any central rule name so this stays additive (not an `extends:`
41+
override).
4042
conditions:
4143
- '-closed'
4244
- '-merged'
4345
- '-author~=\[bot\]$'
4446
- 'author!=copilot-swe-agent'
4547
- 'author!=vyosbot'
4648
- or:
47-
- '-title~=^(([a-zA-Z0-9\-_.]+:\s)?)T\d+:\s+[^\s]+.*'
49+
- '-title~=^(([a-zA-Z0-9\-_.]+:[ ])?)(T[0-9]+|NOS-[0-9]+|VD-[0-9]+):[ ]+[^\s]+.*'
4850
- and:
4951
- 'label!=legacy'
50-
- 'commits[*].commit_message~=^(?!(([a-zA-Z0-9\-_.]+:\s)?)T\d+:\s+[^\s]+).*'
52+
- 'commits[*].commit_message~=^(?!(([a-zA-Z0-9\-_.]+:[ ])?)(T[0-9]+|NOS-[0-9]+|VD-[0-9]+):[ ]+[^\s]+).*'
5153
actions:
5254
label:
5355
toggle:

0 commit comments

Comments
 (0)