Skip to content

Commit 10b3c81

Browse files
authored
Merge pull request #979 from tskit-dev/mergify/configuration-deprecated-update
ci(mergify): upgrade configuration to current format
2 parents 7f23758 + 4780c2d commit 10b3c81

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

.mergify.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
queue_rules:
22
- name: default
3-
conditions:
3+
queue_conditions:
4+
- "-merged"
45
- "#approved-reviews-by>=1"
56
- "#changes-requested-reviews-by=0"
7+
- base=main
8+
- label=AUTOMERGE-REQUESTED
69
- status-success=Lint
710
- status-success=Python (3.9, macos-latest)
811
- status-success=Python (3.12, macos-latest)
@@ -11,15 +14,9 @@ queue_rules:
1114
- status-success=Python (3.9, windows-latest)
1215
- status-success=Python (3.12, windows-latest)
1316
- "status-success=ci/circleci: build"
14-
15-
pull_request_rules:
16-
- name: Automatic rebase, CI and merge
17-
conditions:
18-
- "-merged"
17+
merge_conditions:
1918
- "#approved-reviews-by>=1"
2019
- "#changes-requested-reviews-by=0"
21-
- base=main
22-
- label=AUTOMERGE-REQUESTED
2320
- status-success=Lint
2421
- status-success=Python (3.9, macos-latest)
2522
- status-success=Python (3.12, macos-latest)
@@ -28,12 +25,10 @@ pull_request_rules:
2825
- status-success=Python (3.9, windows-latest)
2926
- status-success=Python (3.12, windows-latest)
3027
- "status-success=ci/circleci: build"
31-
actions:
32-
queue:
33-
name: default
34-
method: rebase
35-
update_method: rebase
28+
merge_method: rebase
29+
update_method: rebase
3630

31+
pull_request_rules:
3732
- name: Remove label after merge
3833
conditions:
3934
- merged
@@ -42,3 +37,7 @@ pull_request_rules:
4237
label:
4338
remove:
4439
- AUTOMERGE-REQUESTED
40+
- name: refactored queue action rule
41+
conditions: []
42+
actions:
43+
queue:

0 commit comments

Comments
 (0)