Skip to content

Commit 2b3412a

Browse files
authored
Merge pull request #440 from tskit-dev/mergify/configuration-deprecated-update
ci(mergify): upgrade configuration to current format
2 parents a715f5f + 4637085 commit 2b3412a

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.mergify.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
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=ci/circleci: build"
710
- status-success=Docs
8-
pull_request_rules:
9-
- name: Automatic rebase, CI and merge
10-
conditions:
11-
- "-merged"
11+
merge_conditions:
1212
- "#approved-reviews-by>=1"
1313
- "#changes-requested-reviews-by=0"
14-
- base=main
15-
- label=AUTOMERGE-REQUESTED
1614
- "status-success=ci/circleci: build"
1715
- status-success=Docs
18-
actions:
19-
queue:
20-
name: default
21-
method: rebase
22-
update_method: rebase
16+
merge_method: rebase
17+
update_method: rebase
2318

19+
pull_request_rules:
2420
- name: Remove label after merge
2521
conditions:
2622
- merged
2723
- label=AUTOMERGE-REQUESTED
2824
actions:
2925
label:
3026
remove:
31-
- AUTOMERGE-REQUESTED
27+
- AUTOMERGE-REQUESTED
28+
- name: refactored queue action rule
29+
conditions: []
30+
actions:
31+
queue:

0 commit comments

Comments
 (0)