Skip to content

Commit 85b2cd7

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 131b182 commit 85b2cd7

File tree

1 file changed

+77
-8
lines changed

1 file changed

+77
-8
lines changed

.mergify.yml

+77-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,82 @@
11
# https://blog.mergify.com/strict-mode-deprecation/
22
queue_rules:
3-
- name: default
4-
# These define the conditions to get out of the merge queue
5-
conditions:
3+
- name: duplicated default from Automatic merge on Azure Pipelines and Reviewable
4+
successes
5+
queue_conditions:
6+
- base=master
7+
- "#approved-reviews-by>=2"
8+
- status-success=ubuntu-24.04 - Python 3.9 x64
9+
- status-success=macos-14 - Python 3.9 arm64
10+
- status-success=windows-2019 - Python 3.9 x64
11+
- status-success=windows-2019 - Python 3.9 x86
12+
- status-success=Vim tests - new
13+
- status-success=Vim tests - old
14+
- status-success=code-review/reviewable
15+
merge_conditions:
16+
- status-success=ubuntu-24.04 - Python 3.9 x64
17+
- status-success=macos-14 - Python 3.9 arm64
18+
- status-success=windows-2019 - Python 3.9 x64
19+
- status-success=windows-2019 - Python 3.9 x86
20+
- status-success=Vim tests - new
21+
- status-success=Vim tests - old
22+
merge_method: merge
23+
- name: duplicated default from Manual merge on Azure Pipelines and Maintainer Override
24+
queue_conditions:
25+
- base=master
626
- status-success=ubuntu-24.04 - Python 3.9 x64
727
- status-success=macos-14 - Python 3.9 arm64
828
- status-success=windows-2019 - Python 3.9 x64
929
- status-success=windows-2019 - Python 3.9 x86
1030
- status-success=Vim tests - new
1131
- status-success=Vim tests - old
32+
- "#approved-reviews-by>=1"
33+
- "#changes-requested-reviews-by=0"
34+
- label="Ship It!"
35+
merge_conditions:
36+
- status-success=ubuntu-24.04 - Python 3.9 x64
37+
- status-success=macos-14 - Python 3.9 arm64
38+
- status-success=windows-2019 - Python 3.9 x64
39+
- status-success=windows-2019 - Python 3.9 x86
40+
- status-success=Vim tests - new
41+
- status-success=Vim tests - old
42+
merge_method: merge
43+
- name: duplicated default from Manual merge on Pipelines and Maintainer Override
44+
from owner PR
45+
queue_conditions:
46+
- base=master
47+
- author=puremourning
48+
- status-success=ubuntu-24.04 - Python 3.9 x64
49+
- status-success=macos-14 - Python 3.9 arm64
50+
- status-success=windows-2019 - Python 3.9 x64
51+
- status-success=windows-2019 - Python 3.9 x86
52+
- status-success=Vim tests - new
53+
- status-success=Vim tests - old
54+
- "#changes-requested-reviews-by=0"
55+
- label="Ship It!"
56+
merge_conditions:
57+
- status-success=ubuntu-24.04 - Python 3.9 x64
58+
- status-success=macos-14 - Python 3.9 arm64
59+
- status-success=windows-2019 - Python 3.9 x64
60+
- status-success=windows-2019 - Python 3.9 x86
61+
- status-success=Vim tests - new
62+
- status-success=Vim tests - old
63+
merge_method: merge
64+
- name: duplicated default from Merge auto pr when approved
65+
queue_conditions:
66+
- author=VimspectorUpdateBot
67+
- label=auto
68+
- base=master
69+
- status-success=code-review/reviewable
70+
- "#approved-reviews-by>=1"
71+
- "#changes-requested-reviews-by=0"
72+
merge_conditions:
73+
- status-success=ubuntu-24.04 - Python 3.9 x64
74+
- status-success=macos-14 - Python 3.9 arm64
75+
- status-success=windows-2019 - Python 3.9 x64
76+
- status-success=windows-2019 - Python 3.9 x86
77+
- status-success=Vim tests - new
78+
- status-success=Vim tests - old
79+
merge_method: merge
1280

1381
pull_request_rules:
1482
- name: Automatic merge on Azure Pipelines and Reviewable successes
@@ -23,9 +91,6 @@ pull_request_rules:
2391
- status-success=Vim tests - old
2492
- status-success=code-review/reviewable
2593
actions: &merge-actions
26-
queue:
27-
method: merge
28-
name: default
2994
comment:
3095
message: Thanks for sending a PR!
3196

@@ -45,7 +110,6 @@ pull_request_rules:
45110
- label="Ship It!"
46111
actions:
47112
<<: *merge-actions
48-
49113
- name: Manual merge on Pipelines and Maintainer Override from owner PR
50114
conditions:
51115
- base=master
@@ -61,7 +125,6 @@ pull_request_rules:
61125
- label="Ship It!"
62126
actions:
63127
<<: *merge-actions
64-
65128
- name: Merge auto pr when approved
66129
conditions:
67130
- author=VimspectorUpdateBot
@@ -73,3 +136,9 @@ pull_request_rules:
73136
- "#changes-requested-reviews-by=0"
74137
actions:
75138
<<: *merge-actions
139+
- name: Automatic merge on Azure Pipelines and Reviewable successes + Manual merge
140+
on Azure Pipelines and Maintainer Override + Manual merge on Pipelines and Maintainer
141+
Override from owner PR + Merge auto pr when approved
142+
conditions: []
143+
actions:
144+
queue:

0 commit comments

Comments
 (0)