Skip to content

Commit 76db742

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 6a205ec commit 76db742

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

.mergify.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ queue_rules:
88
- "#approved-reviews-by >= 1"
99
- base = main
1010
merge_method: merge
11-
autosquash: true
11+
autosquash: true
1212

1313
- name: backport-apps-101.1-queue
1414
batch_size: 3
1515
queue_conditions:
1616
- "#approved-reviews-by >= 1"
1717
- base = maint-101.1
1818
merge_method: merge
19-
autosquash: true
19+
autosquash: true
2020

2121
- name: backport-libs-0.150-queue
2222
batch_size: 3
2323
queue_conditions:
2424
- "#approved-reviews-by >= 1"
2525
- base = maint-libs-0.150
2626
merge_method: merge
27-
autosquash: true
27+
autosquash: true
2828

2929
pull_request_rules:
3030
- name: automatic merge to main or backport branch
@@ -33,9 +33,9 @@ pull_request_rules:
3333
- label != "do-not-merge"
3434
- "#approved-reviews-by >= 1"
3535
- or:
36-
- base = main
37-
- base = maint-101.1
38-
- base = maint-libs-0.150
36+
- base = main
37+
- base = maint-101.1
38+
- base = maint-libs-0.150
3939
actions:
4040
queue:
4141

@@ -67,3 +67,12 @@ pull_request_rules:
6767
backport:
6868
branches:
6969
- "maint-libs-0.150"
70+
priority_rules:
71+
- name: priority for queue `main-queue`
72+
conditions:
73+
- base = main
74+
priority: 2500
75+
- name: priority for queue `backport-apps-101.1-queue`
76+
conditions:
77+
- base = maint-101.1
78+
priority: 2250

0 commit comments

Comments
 (0)