Skip to content

Commit cdc20eb

Browse files
committed
ci(mergify): upgrade configuration to current format (#647)
Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 3162fef) # Conflicts: # .mergify.yml
1 parent 011d3b9 commit cdc20eb

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

.mergify.yml

+14-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
queue_rules:
22
- name: automerge
3-
conditions:
4-
- check-success=Deprecation_Messages_and_Coverage (3.8)
5-
6-
pull_request_rules:
7-
- name: automatic merge on CI success and review
8-
conditions:
3+
queue_conditions:
94
- check-success=Deprecation_Messages_and_Coverage (3.8)
105
- "#approved-reviews-by>=1"
116
- label=automerge
127
- label!=on hold
13-
actions:
14-
queue:
15-
name: automerge
16-
method: squash
8+
merge_conditions:
9+
- check-success=Deprecation_Messages_and_Coverage (3.8)
10+
merge_method: squash
11+
12+
pull_request_rules:
1713
- name: backport
1814
conditions:
1915
- label=stable backport potential
2016
actions:
2117
backport:
2218
branches:
19+
<<<<<<< HEAD
2320
- stable/0.5
21+
=======
22+
- stable/0.6
23+
- name: automatic merge on CI success and review
24+
conditions: []
25+
actions:
26+
queue:
27+
>>>>>>> 3162fef (ci(mergify): upgrade configuration to current format (#647))

0 commit comments

Comments
 (0)