Skip to content

Commit 4d371a9

Browse files
authored
ci(mergify): upgrade configuration to current format (#1439)
Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com>
1 parent 851c79f commit 4d371a9

File tree

1 file changed

+45
-38
lines changed

1 file changed

+45
-38
lines changed

.github/mergify.yml

+45-38
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,6 @@
11
queue_rules:
2-
- name: default queue
3-
conditions:
4-
- label!=work-in-progress
5-
- label!=wip
6-
- status-success~=^build\s\(.*\)$
7-
8-
pull_request_rules:
9-
- name: automatic approval for release package PR
10-
conditions:
11-
- author~=^ConfluxBot$
12-
- base=dev
13-
- head=__release-pkg
14-
actions:
15-
review:
16-
type: APPROVE
17-
message: Automatically approving release package PR
18-
- name: automatic update PR with merge
19-
conditions:
20-
- -conflict
21-
- -draft
22-
- label!=work-in-progress
23-
- label!=wip
24-
- label!=no-auto-merge-updates
25-
- head!=dev
26-
- head!=main
27-
actions:
28-
update:
29-
- name: Automatic queue to dev on approval [low]
30-
conditions:
2+
- name: duplicated default queue from Automatic queue to dev on approval [low]
3+
queue_conditions:
314
- "#approved-reviews-by>=1"
325
- label!=work-in-progress
336
- label!=wip
@@ -44,13 +17,14 @@ pull_request_rules:
4417
- status-success~=^unit-test\s\(.*\)$
4518
- status-success~=^integration-test\s\(.*\)$
4619
- "#review-threads-unresolved=0"
47-
actions:
48-
queue:
49-
name: default queue
50-
method: squash
51-
52-
- name: Automatic queue to dev on approval (__release-pkg) [low]
53-
conditions:
20+
merge_conditions:
21+
- label!=work-in-progress
22+
- label!=wip
23+
- status-success~=^build\s\(.*\)$
24+
merge_method: squash
25+
- name: duplicated default queue from Automatic queue to dev on approval (__release-pkg)
26+
[low]
27+
queue_conditions:
5428
- "#approved-reviews-by>=1"
5529
- label!=work-in-progress
5630
- label!=wip
@@ -62,7 +36,40 @@ pull_request_rules:
6236
- -locked
6337
- status-success~=^build\s\(.*\)$
6438
- "#review-threads-unresolved=0"
39+
merge_conditions:
40+
- label!=work-in-progress
41+
- label!=wip
42+
- status-success~=^build\s\(.*\)$
43+
merge_method: squash
44+
- name: default queue
45+
conditions:
46+
- label!=work-in-progress
47+
- label!=wip
48+
- status-success~=^build\s\(.*\)$
49+
50+
pull_request_rules:
51+
- name: automatic approval for release package PR
52+
conditions:
53+
- author~=^ConfluxBot$
54+
- base=dev
55+
- head=__release-pkg
56+
actions:
57+
review:
58+
type: APPROVE
59+
message: Automatically approving release package PR
60+
- name: automatic update PR with merge
61+
conditions:
62+
- -conflict
63+
- -draft
64+
- label!=work-in-progress
65+
- label!=wip
66+
- label!=no-auto-merge-updates
67+
- head!=dev
68+
- head!=main
69+
actions:
70+
update:
71+
- name: Automatic queue to dev on approval (__release-pkg) [low] + Automatic queue
72+
to dev on approval [low]
73+
conditions: []
6574
actions:
6675
queue:
67-
name: default queue
68-
method: squash

0 commit comments

Comments
 (0)