Skip to content

Commit 5fab9bf

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 8acee93 commit 5fab9bf

File tree

1 file changed

+24
-21
lines changed

1 file changed

+24
-21
lines changed

.mergify.yml

+24-21
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,32 @@
11
queue_rules:
2-
- name: main
3-
conditions:
2+
- name: duplicated main from merge to master
3+
queue_conditions:
4+
- label=automerge:merge
5+
merge_conditions:
46
- base=main
57
# Require integration tests before merging only
68
- check-success=Cloudflare Pages
7-
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:
9+
merge_method: merge
10+
- name: duplicated main from rebase updates then merge to master
11+
queue_conditions:
1712
- label=automerge:rebase
18-
actions:
19-
queue:
20-
name: main
21-
method: merge
22-
update_method: rebase
23-
- name: squash to master
24-
conditions:
13+
merge_conditions:
14+
- base=main
15+
# Require integration tests before merging only
16+
- check-success=Cloudflare Pages
17+
update_method: rebase
18+
merge_method: merge
19+
- name: duplicated main from squash to master
20+
queue_conditions:
2521
- label=automerge:squash
22+
merge_conditions:
23+
- base=main
24+
# Require integration tests before merging only
25+
- check-success=Cloudflare Pages
26+
merge_method: squash
27+
28+
pull_request_rules:
29+
- name: merge to master + rebase updates then merge to master + squash to master
30+
conditions: []
2631
actions:
2732
queue:
28-
name: main
29-
method: squash

0 commit comments

Comments
 (0)