From c1a159e1d0eab5f8773034195dce1578e919c696 Mon Sep 17 00:00:00 2001 From: systemfsoftware-bot <318394648+systemfsoftware-bot@users.noreply.github.com> Date: Fri, 13 Nov 2026 03:30:22 -0500 Subject: [PATCH] ci(mergify): recognise subtree PRs by the org convention The subtree queue now requires one commit carrying both git-subtree trailers and a non-linear history, as the systemfsoftware/.github README describes, so a rebased or squashed subtree PR matches no queue. --- .mergify.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index b2eca74d..5849b051 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -5,10 +5,10 @@ queue_rules: - name: subtree merge_method: merge queue_conditions: - # Recognised from the commits themselves: both anchored git-subtree trailer - # lines must be present (ruling 9, SYS-1246). Same checks as default. - - "commits[*].commit_message ~= (?m)^git-subtree-dir: \\S+$" - - "commits[*].commit_message ~= (?m)^git-subtree-split: [0-9a-f]{40}$" + # Org convention (systemfsoftware/.github README, "Subtree PRs"): one commit + # carries both trailers, and the PR history is not linear. + - 'commits[*].commit_message ~= (?ms)\A(?=.*^git-subtree-dir: \S+$)(?=.*^git-subtree-split: [0-9a-f]{40}$)' + - -linear-history - or: - check-success = review-gate - approved-reviews-by = kiro-systemf[bot] @@ -27,7 +27,7 @@ queue_rules: - name: default # Checked on the PR itself before it enters the queue. queue_conditions: - # Ruling 9 (SYS-1246): subtree PRs merge via the subtree queue above; a subtree + # Subtree PRs merge via the subtree queue above; a subtree # claim without trailers matches no queue and cannot merge at all. - "-commits[*].commit_message ~= (?m)^git-subtree-dir: \\S+$" - "-title ~= (?i)\\b(add|pull|update|sync|vendor|refresh|import)\\b[^.]*\\bsubtrees?\\b|\\bsubtrees?\\b[^.]*(\\badd\\b|\\bpull\\b|\\bupdate\\b|\\bsync\\b|\\bvendor\\b|\\brefresh\\b|\\bimport\\b)"