Skip to content

Commit 8418ab7

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 35d1882 commit 8418ab7

File tree

1 file changed

+84
-6
lines changed

1 file changed

+84
-6
lines changed

.mergify.yml

+84-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,91 @@
11
# https://blog.mergify.com/strict-mode-deprecation/
22
queue_rules:
3+
- name: duplicated default from Manual merge on Azure Pipelines and Maintainer Override
4+
queue_conditions:
5+
- base=master
6+
- "#approved-reviews-by>=2"
7+
- status-success=ubuntu-24.04 - Python 3.9 x64
8+
- status-success=macos-14 - Python 3.9 arm64
9+
- status-success=windows-2019 - Python 3.9 x64
10+
- status-success=windows-2019 - Python 3.9 x86
11+
- status-success=Vim tests - new
12+
- status-success=Vim tests - old
13+
- status-success=code-review/reviewable
14+
- base=master
15+
- status-success=ubuntu-24.04 - Python 3.9 x64
16+
- status-success=macos-14 - Python 3.9 arm64
17+
- status-success=windows-2019 - Python 3.9 x64
18+
- status-success=windows-2019 - Python 3.9 x86
19+
- status-success=Vim tests - new
20+
- status-success=Vim tests - old
21+
- "#approved-reviews-by>=1"
22+
- "#changes-requested-reviews-by=0"
23+
- label="Ship It!"
24+
merge_conditions: []
25+
merge_method: merge
26+
- name: duplicated default from Manual merge on Pipelines and Maintainer Override
27+
from owner PR
28+
queue_conditions:
29+
- base=master
30+
- "#approved-reviews-by>=2"
31+
- status-success=ubuntu-24.04 - Python 3.9 x64
32+
- status-success=macos-14 - Python 3.9 arm64
33+
- status-success=windows-2019 - Python 3.9 x64
34+
- status-success=windows-2019 - Python 3.9 x86
35+
- status-success=Vim tests - new
36+
- status-success=Vim tests - old
37+
- status-success=code-review/reviewable
38+
- base=master
39+
- author=puremourning
40+
- status-success=ubuntu-24.04 - Python 3.9 x64
41+
- status-success=macos-14 - Python 3.9 arm64
42+
- status-success=windows-2019 - Python 3.9 x64
43+
- status-success=windows-2019 - Python 3.9 x86
44+
- status-success=Vim tests - new
45+
- status-success=Vim tests - old
46+
- "#changes-requested-reviews-by=0"
47+
- label="Ship It!"
48+
merge_conditions: []
49+
merge_method: merge
50+
- name: duplicated default from Merge auto pr when approved
51+
queue_conditions:
52+
- base=master
53+
- "#approved-reviews-by>=2"
54+
- status-success=ubuntu-24.04 - Python 3.9 x64
55+
- status-success=macos-14 - Python 3.9 arm64
56+
- status-success=windows-2019 - Python 3.9 x64
57+
- status-success=windows-2019 - Python 3.9 x86
58+
- status-success=Vim tests - new
59+
- status-success=Vim tests - old
60+
- status-success=code-review/reviewable
61+
- author=VimspectorUpdateBot
62+
- label=auto
63+
- base=master
64+
- status-success=code-review/reviewable
65+
- "#approved-reviews-by>=1"
66+
- "#changes-requested-reviews-by=0"
67+
merge_conditions: []
68+
merge_method: merge
369
- name: default
470
# These define the conditions to get out of the merge queue
5-
conditions:
71+
queue_conditions:
72+
- base=master
73+
- "#approved-reviews-by>=2"
674
- status-success=ubuntu-24.04 - Python 3.9 x64
775
- status-success=macos-14 - Python 3.9 arm64
876
- status-success=windows-2019 - Python 3.9 x64
977
- status-success=windows-2019 - Python 3.9 x86
1078
- status-success=Vim tests - new
1179
- status-success=Vim tests - old
80+
- status-success=code-review/reviewable
81+
merge_conditions:
82+
- status-success=ubuntu-24.04 - Python 3.9 x64
83+
- status-success=macos-14 - Python 3.9 arm64
84+
- status-success=windows-2019 - Python 3.9 x64
85+
- status-success=windows-2019 - Python 3.9 x86
86+
- status-success=Vim tests - new
87+
- status-success=Vim tests - old
88+
merge_method: merge
1289

1390
pull_request_rules:
1491
- name: Automatic merge on Azure Pipelines and Reviewable successes
@@ -23,9 +100,6 @@ pull_request_rules:
23100
- status-success=Vim tests - old
24101
- status-success=code-review/reviewable
25102
actions: &merge-actions
26-
queue:
27-
method: merge
28-
name: default
29103
comment:
30104
message: Thanks for sending a PR!
31105

@@ -45,7 +119,6 @@ pull_request_rules:
45119
- label="Ship It!"
46120
actions:
47121
<<: *merge-actions
48-
49122
- name: Manual merge on Pipelines and Maintainer Override from owner PR
50123
conditions:
51124
- base=master
@@ -61,7 +134,6 @@ pull_request_rules:
61134
- label="Ship It!"
62135
actions:
63136
<<: *merge-actions
64-
65137
- name: Merge auto pr when approved
66138
conditions:
67139
- author=VimspectorUpdateBot
@@ -73,3 +145,9 @@ pull_request_rules:
73145
- "#changes-requested-reviews-by=0"
74146
actions:
75147
<<: *merge-actions
148+
- name: Automatic merge on Azure Pipelines and Reviewable successes + Manual merge
149+
on Azure Pipelines and Maintainer Override + Manual merge on Pipelines and Maintainer
150+
Override from owner PR + Merge auto pr when approved
151+
conditions: []
152+
actions:
153+
queue:

0 commit comments

Comments
 (0)