Skip to content

Commit 912f1bd

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent a03ff28 commit 912f1bd

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

.mergify.yml

+20-21
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
queue_rules:
2+
- name: duplicated main from rebase updates then merge to master
3+
queue_conditions:
4+
- label=automerge:merge
5+
- label=automerge:rebase
6+
merge_conditions: []
7+
merge_method: merge
8+
update_method: rebase
9+
- name: duplicated main from squash to master
10+
queue_conditions:
11+
- label=automerge:merge
12+
- label=automerge:squash
13+
merge_conditions: []
14+
merge_method: squash
215
- name: main
3-
conditions:
16+
queue_conditions:
17+
- label=automerge:merge
18+
merge_conditions:
419
- base=main
520
# Require integration tests before merging only
621
- check-success=Cloudflare Pages
22+
merge_method: merge
23+
724
pull_request_rules:
8-
- name: merge to master
9-
conditions:
10-
- label=automerge:merge
11-
actions:
12-
queue:
13-
name: main
14-
method: merge
15-
- name: rebase updates then merge to master
16-
conditions:
17-
- label=automerge:rebase
18-
actions:
19-
queue:
20-
name: main
21-
method: merge
22-
update_method: rebase
23-
- name: squash to master
24-
conditions:
25-
- label=automerge:squash
25+
- name: merge to master + rebase updates then merge to master + squash to master
26+
conditions: []
2627
actions:
2728
queue:
28-
name: main
29-
method: squash

0 commit comments

Comments
 (0)