Skip to content

Commit 6ca033c

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent ce8cb3c commit 6ca033c

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

.mergify.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,20 @@ queue_rules:
77
- and: &CheckRuns
88
- check-success=test
99
- schedule=Mon-Fri 09:00-17:30[Europe/Paris]
10-
speculative_checks: 5
11-
1210
- name: lowprio
13-
allow_inplace_checks: true
14-
conditions:
11+
queue_conditions:
12+
- and: *CheckRuns
13+
- author=dependabot[bot]
14+
- label!=work-in-progress
15+
- label!=manual merge
16+
merge_conditions:
1517
- and: *CheckRuns
1618
- schedule=Mon-Fri 09:00-17:00[Europe/Paris]
19+
allow_inplace_checks: true
1720
batch_size: 7
1821
batch_max_wait_time: 5min
1922
queue_branch_merge_method: fast-forward
20-
disallow_checks_interruption_from_queues:
21-
- default
23+
merge_method: merge
2224

2325
pull_request_rules:
2426
- name: automatic merge
@@ -34,17 +36,6 @@ pull_request_rules:
3436
queue:
3537
name: default
3638

37-
- name: automatic merge from dependabot
38-
conditions:
39-
- and: *CheckRuns
40-
- author=dependabot[bot]
41-
- label!=work-in-progress
42-
- label!=manual merge
43-
actions:
44-
queue:
45-
name: lowprio
46-
method: merge
47-
4839
- name: request review
4940
conditions:
5041
- -author=dependabot[bot]
@@ -59,3 +50,6 @@ pull_request_rules:
5950
request_reviews:
6051
teams:
6152
- devs
53+
54+
merge_queue:
55+
max_parallel_checks: 5

0 commit comments

Comments
 (0)