Skip to content

Commit 7b691f0

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 269c26f commit 7b691f0

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

.mergify.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
queue_rules:
22
- name: automerge
3-
conditions: [] # No additional rules, because branch-protection does them.
4-
5-
pull_request_rules:
6-
- name: automatic merge on CI success and review
7-
conditions:
3+
queue_conditions:
84
- base=main
95
- "#approved-reviews-by>=1"
106
- label=automerge
117
- label!=on hold
12-
# GitHub branch-protection rules are automatically applied by mergify, so
13-
# the queue can't actually merge things unless _all_ statuses are passed.
14-
# This section is just a sanity check before the PR can enter the main
15-
# queue.
168
- or:
17-
- check-success=tests_linux (3.10, ubuntu-latest)
18-
- check-neutral=tests_linux (3.10, ubuntu-latest)
19-
- check-skipped=tests_linux (3.10, ubuntu-latest)
9+
- check-success=tests_linux (3.10, ubuntu-latest)
10+
- check-neutral=tests_linux (3.10, ubuntu-latest)
11+
- check-skipped=tests_linux (3.10, ubuntu-latest)
12+
merge_conditions: [] # No additional rules, because branch-protection does them.
13+
14+
merge_method: squash
15+
16+
pull_request_rules:
17+
- name: automatic merge on CI success and review
18+
conditions: []
2019
actions:
2120
queue:
22-
name: automerge
23-
method: squash

0 commit comments

Comments
 (0)