From a6fc481646c7941e3e0733320bd27a94ddafac7c Mon Sep 17 00:00:00 2001 From: systemfsoftware-bot <318394648+systemfsoftware-bot@users.noreply.github.com> Date: Fri, 13 Nov 2026 03:52:40 -0500 Subject: [PATCH] ci: use the org README's subtree form in the default merge queue --- .mergify.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 5849b051..af0ec702 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -27,15 +27,19 @@ queue_rules: - name: default # Checked on the PR itself before it enters the queue. queue_conditions: - # 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)" - # Vendored subtree prefixes in this repo: hand edits without trailers cannot merge. + # Subtree PRs merge via the subtree queue above (org README, "Subtree PRs"): a pull request that names a + # subtree in its title and touches a vendored prefix needs the trailers, or it matches no queue. + - '-commits[*].commit_message ~= (?m)^git-subtree-dir: \S+$' - not: - or: - - "added-files ~= ^(repos/alchemy|repos/effect)/" - - "modified-files ~= ^(repos/alchemy|repos/effect)/" + and: + - 'title ~= (?i)(?