Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Jan 16, 2025
1 parent 8acee93 commit 5fab9bf
Showing 1 changed file with 24 additions and 21 deletions.
45 changes: 24 additions & 21 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
queue_rules:
- name: main
conditions:
- name: duplicated main from merge to master
queue_conditions:
- label=automerge:merge
merge_conditions:
- base=main
# Require integration tests before merging only
- check-success=Cloudflare Pages
pull_request_rules:
- name: merge to master
conditions:
- label=automerge:merge
actions:
queue:
name: main
method: merge
- name: rebase updates then merge to master
conditions:
merge_method: merge
- name: duplicated main from rebase updates then merge to master
queue_conditions:
- label=automerge:rebase
actions:
queue:
name: main
method: merge
update_method: rebase
- name: squash to master
conditions:
merge_conditions:
- base=main
# Require integration tests before merging only
- check-success=Cloudflare Pages
update_method: rebase
merge_method: merge
- name: duplicated main from squash to master
queue_conditions:
- label=automerge:squash
merge_conditions:
- base=main
# Require integration tests before merging only
- check-success=Cloudflare Pages
merge_method: squash

pull_request_rules:
- name: merge to master + rebase updates then merge to master + squash to master
conditions: []
actions:
queue:
name: main
method: squash

0 comments on commit 5fab9bf

Please sign in to comment.