Skip to content

feat(mergify): subtree PRs merge with a merge commit, never a squash (SYS-1246) #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
systemfsoftware-maker wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −0
Open

feat(mergify): subtree PRs merge with a merge commit, never a squash (SYS-1246) #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,27 @@
extends: .github

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}$"
- check-success = no merge conflicts
- check-success = build · lint · typecheck · test / static checks (pnpm check:static)
- or:
- check-success = commitlint / lint PR commits
- check-skipped = commitlint / lint PR commits
merge_conditions:
- check-success = build · lint · typecheck · test / the gate (pnpm check:ci)

- name: default
queue_conditions:
# Ruling 9 (SYS-1246): 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)"
- check-success = no merge conflicts
- check-success = build · lint · typecheck · test / static checks (pnpm check:static)
- or:
Expand Down
Loading