Skip to content

Commit 901c874

Browse files
authored
Merge pull request #896 from puremourning/mergify/configuration-deprecated-update
ci(mergify): upgrade configuration to current format
2 parents 696c52a + 1df8196 commit 901c874

File tree

1 file changed

+68
-5
lines changed

1 file changed

+68
-5
lines changed

.mergify.yml

Lines changed: 68 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,67 @@
11
# https://blog.mergify.com/strict-mode-deprecation/
22
queue_rules:
3+
- name: duplicated default from Merge owner PR when all checks passed
4+
queue_conditions:
5+
- author=puremourning
6+
- base=master
7+
- status-success=code-review/reviewable
8+
- "#changes-requested-reviews-by=0"
9+
- status-success=PythonLint
10+
- status-success=VimscriptLint
11+
- status-success=Linux (vim)
12+
- status-success=Linux (nvim)
13+
- status-success=MacOS (vim)
14+
merge_conditions:
15+
# CI https://doc.mergify.io/conditions.html#github-actions
16+
- status-success=PythonLint
17+
- status-success=VimscriptLint
18+
- status-success=Linux (vim)
19+
- status-success=Linux (nvim)
20+
- status-success=MacOS (vim)
21+
#- status-success=MacOS (nvim)
22+
23+
merge_method: merge
24+
- name: duplicated default from Merge auto pr when approved
25+
queue_conditions:
26+
- author=VimspectorUpdateBot
27+
- label=auto
28+
- base=master
29+
- status-success=code-review/reviewable
30+
- "#approved-reviews-by>=1"
31+
- "#changes-requested-reviews-by=0"
32+
merge_conditions:
33+
# CI https://doc.mergify.io/conditions.html#github-actions
34+
- status-success=PythonLint
35+
- status-success=VimscriptLint
36+
- status-success=Linux (vim)
37+
- status-success=Linux (nvim)
38+
- status-success=MacOS (vim)
39+
#- status-success=MacOS (nvim)
40+
41+
merge_method: merge
42+
- name: duplicated default from Merge PR when all checks passed
43+
queue_conditions:
44+
- author!=puremourning
45+
- base=master
46+
- status-success=code-review/reviewable
47+
- "#approved-reviews-by>=1"
48+
- "#changes-requested-reviews-by=0"
49+
- approved-reviews-by=puremourning
50+
- status-success=PythonLint
51+
- status-success=VimscriptLint
52+
- status-success=Linux (vim)
53+
- status-success=Linux (nvim)
54+
- status-success=MacOS (vim)
55+
merge_conditions:
56+
# CI https://doc.mergify.io/conditions.html#github-actions
57+
- status-success=PythonLint
58+
- status-success=VimscriptLint
59+
- status-success=Linux (vim)
60+
- status-success=Linux (nvim)
61+
- status-success=MacOS (vim)
62+
#- status-success=MacOS (nvim)
63+
64+
merge_method: merge
365
- name: default
466
# These define the conditions to get out of the merge queue
567
conditions:
@@ -11,6 +73,7 @@ queue_rules:
1173
- status-success=MacOS (vim)
1274
#- status-success=MacOS (nvim)
1375

76+
1477
pull_request_rules:
1578
- name: Merge owner PR when all checks passed
1679
# These define the conditions to get into the merge queue
@@ -28,11 +91,7 @@ pull_request_rules:
2891
- status-success=MacOS (vim)
2992
#- status-success=MacOS (nvim)
3093
actions: &merge-actions
31-
queue:
32-
method: merge
33-
name: default
3494
delete_head_branch: {}
35-
3695
- name: Merge auto pr when approved
3796
conditions:
3897
- author=VimspectorUpdateBot
@@ -44,7 +103,6 @@ pull_request_rules:
44103
- "#changes-requested-reviews-by=0"
45104
actions:
46105
<<: *merge-actions
47-
48106
- name: Merge PR when all checks passed
49107
# These define the conditions to get into the merge queue
50108
conditions:
@@ -66,3 +124,8 @@ pull_request_rules:
66124
<<: *merge-actions
67125
comment:
68126
message: Thanks for sending a PR!
127+
- name: Merge PR when all checks passed + Merge auto pr when approved + Merge owner
128+
PR when all checks passed
129+
conditions: []
130+
actions:
131+
queue:

0 commit comments

Comments
 (0)