Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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)"
Expand Down
Loading