Skip to content

Commit b353fcc

Browse files
authored
Merge pull request #1467 from Conflux-Chain/mergify/iosh/config-update
ci(Mergify): configuration update
2 parents 51de588 + ff78e70 commit b353fcc

File tree

1 file changed

+38
-4
lines changed

1 file changed

+38
-4
lines changed

.github/mergify.yml

+38-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ queue_rules:
4242
- status-success~=^build\s\(.*\)$
4343
merge_method: squash
4444
- name: default queue
45-
conditions:
45+
queue_conditions:
4646
- label!=work-in-progress
4747
- label!=wip
4848
- status-success~=^build\s\(.*\)$
@@ -68,8 +68,42 @@ pull_request_rules:
6868
- head!=main
6969
actions:
7070
update:
71-
- name: Automatic queue to dev on approval (__release-pkg) [low] + Automatic queue
72-
to dev on approval [low]
73-
conditions: []
71+
- name: Automatic queue to dev on approval [low]
72+
conditions:
73+
- "#approved-reviews-by>=1"
74+
- label!=work-in-progress
75+
- label!=wip
76+
- label!=no-auto-squash-merge
77+
- base=dev
78+
- head!=next
79+
- -conflict
80+
- -draft
81+
- -locked
82+
- status-success~=^version-check\s\(.*\)$
83+
- status-success~=^lint\s\(.*\)$
84+
- status-success~=^build\s\(.*\)$
85+
- status-success~=^build-doc\s\(.*\)$
86+
- status-success~=^unit-test\s\(.*\)$
87+
- status-success~=^integration-test\s\(.*\)$
88+
- "#review-threads-unresolved=0"
7489
actions:
7590
queue:
91+
name: default queue
92+
93+
- name: Automatic queue to dev on approval (__release-pkg) [low]
94+
conditions:
95+
- "#approved-reviews-by>=1"
96+
- label!=work-in-progress
97+
- label!=wip
98+
- label!=no-auto-squash-merge
99+
- base=dev
100+
- head=__release-pkg
101+
- -conflict
102+
- -draft
103+
- -locked
104+
- status-success~=^build\s\(.*\)$
105+
- "#review-threads-unresolved=0"
106+
actions:
107+
queue:
108+
name: default queue
109+

0 commit comments

Comments
 (0)