Skip to content

Commit 63eaf11

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 2472527 commit 63eaf11

File tree

1 file changed

+35
-14
lines changed

1 file changed

+35
-14
lines changed

.mergify.yml

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,54 @@ merge_queue:
22
max_parallel_checks: 3
33

44
queue_rules:
5+
- name: duplicated main-queue from automatic merge to main or backport branch
6+
batch_size: 3
7+
queue_conditions:
8+
- "#approved-reviews-by >= 1"
9+
- base = main
10+
- label = "merge"
11+
- label != "do-not-merge"
12+
- "#approved-reviews-by >= 1"
13+
- &id001
14+
or:
15+
- base = main
16+
- base = maint-0.45
17+
merge_conditions: []
18+
merge_method: merge
19+
autosquash: true
520
- name: main-queue
621
batch_size: 3
722
queue_conditions:
823
- "#approved-reviews-by >= 1"
924
- base = main
1025
merge_method: merge
1126

27+
- name: duplicated backport-0.45-queue from automatic merge to main or backport
28+
branch
29+
batch_size: 3
30+
queue_conditions:
31+
- "#approved-reviews-by >= 1"
32+
- base = maint-0.45
33+
- label = "merge"
34+
- label != "do-not-merge"
35+
- "#approved-reviews-by >= 1"
36+
- *id001
37+
merge_conditions: []
38+
merge_method: merge
39+
autosquash: true
1240
- name: backport-0.45-queue
1341
batch_size: 3
1442
queue_conditions:
1543
- "#approved-reviews-by >= 1"
1644
- base = maint-0.45
1745
merge_method: merge
1846

19-
pull_request_rules:
20-
- name: automatic merge to main or backport branch
21-
conditions:
22-
- label = "merge"
23-
- label != "do-not-merge"
24-
- "#approved-reviews-by >= 1"
25-
- or:
26-
- base = main
27-
- base = maint-0.45
28-
actions:
29-
queue:
30-
autosquash: true
3147

48+
pull_request_rules:
3249
- name: notify when a PR is removed from the queue
3350
conditions:
34-
- queue-dequeue-reason != none
35-
- queue-dequeue-reason != pr-merged
51+
- queue-dequeue-reason != none
52+
- queue-dequeue-reason != pr-merged
3653
actions:
3754
comment:
3855
message: >
@@ -49,3 +66,7 @@ pull_request_rules:
4966
backport:
5067
branches:
5168
- "maint-0.45"
69+
- name: refactored queue action rule
70+
conditions: []
71+
actions:
72+
queue:

0 commit comments

Comments
 (0)