Skip to content

Commit 9efd548

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 66cdaf7 commit 9efd548

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

.github/mergify.yml

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,30 @@
11
queue_rules:
22
- name: default
3-
conditions: []
4-
5-
pull_request_rules:
6-
- name: Automatic merge on approval
7-
conditions:
3+
queue_conditions:
84
- and:
95
- 'base==master'
106
- '#review-threads-unresolved=0'
117
- '#changes-requested-reviews-by=0'
128
- 'label!=do-not-merge'
139
- '#approved-reviews-by>=1'
14-
actions:
15-
queue:
16-
name: default
17-
method: squash
10+
merge_conditions: []
11+
merge_method: squash
1812

13+
pull_request_rules:
1914
- name: remove outdated reviews for non trusted authors
2015
conditions:
2116
- and:
2217
- base=master
2318
- author!=@ecopod
2419
actions:
2520
dismiss_reviews: {}
26-
2721
- name: Ask to resolve conflict
2822
conditions:
2923
- conflict
3024
actions:
3125
comment:
32-
message: Hey @{{author}}! This PR has merge conflicts. Please fix them before continuing review.
26+
message: Hey @{{author}}! This PR has merge conflicts. Please fix them before
27+
continuing review.
3328
label:
3429
add:
3530
- conflict
@@ -68,3 +63,7 @@ pull_request_rules:
6863
comment:
6964
message: |
7065
Congrats! Your token has been merged. Consider joining our Discord to stay up to date with other builders in the ecosystem. Make sure to drink plenty of water.
66+
- name: refactored queue action rule
67+
conditions: []
68+
actions:
69+
queue:

0 commit comments

Comments
 (0)