Skip to content

Commit 1b9e884

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 2507dea commit 1b9e884

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.mergify.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
queue_rules:
22
- name: default
3-
conditions:
3+
queue_conditions:
44
- base=main
55
- status-success=build (3.10)
66
- status-success=build (3.11)
77
- status-success=win_build (3.10)
88
- approved-reviews-by=@sgkit-dev/committers
99
- "#approved-reviews-by>=1"
1010
- label=auto-merge
11-
12-
pull_request_rules:
13-
- name: automatic merge
14-
conditions:
11+
merge_conditions:
1512
- base=main
1613
- status-success=build (3.10)
1714
- status-success=build (3.11)
1815
- status-success=win_build (3.10)
1916
- approved-reviews-by=@sgkit-dev/committers
2017
- "#approved-reviews-by>=1"
2118
- label=auto-merge
22-
actions:
23-
queue:
24-
name: default
25-
method: rebase
19+
merge_method: rebase
20+
21+
pull_request_rules:
2622
- name: deleting merged branch
2723
conditions:
2824
- merged
@@ -44,3 +40,7 @@ pull_request_rules:
4440
label:
4541
remove:
4642
- conflict
43+
- name: automatic merge
44+
conditions: []
45+
actions:
46+
queue:

0 commit comments

Comments
 (0)