Skip to content

Commit d43704a

Browse files
committed
try out merge queues
also adjust the labels set for the bot to avoid making noise when it's being shoved straight in
1 parent f6863c0 commit d43704a

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

.github/mergify.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ pull_request_rules:
5555
- base=master
5656
- -draft
5757
- -closed
58+
- '-label=merge delay passed'
59+
- '-label=priority: high :fire:'
5860
- or:
5961
- label=merge me
6062
- label=squash+merge me
@@ -189,14 +191,21 @@ pull_request_rules:
189191
conditions:
190192
- body~=automatic backport
191193

194+
merge_queue:
195+
max_parallel_checks: 2
196+
192197
queue_rules:
193198
# Mergify now requires different queues for different strategies
194199
- name: default
200+
batch_size: 3
201+
batch_max_wait_time: 10 min
195202
update_bot_account: Mikolaj
196203
merge_method: merge
197204
update_method: rebase
198205

199206
- name: squash-merge
207+
batch_size: 3
208+
batch_max_wait_time: 10 min
200209
update_bot_account: Mikolaj
201210
merge_method: squash
202211
update_method: merge

0 commit comments

Comments
 (0)