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 Nov 22, 2024
1 parent 55d1465 commit ac9cbc3
Showing 1 changed file with 20 additions and 6 deletions.
26 changes: 20 additions & 6 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
queue_rules:
- name: duplicated default from Auto Rebase and Merge
queue_conditions:
- base=master
- status-success=ci
- 'label=ready to squash and merge'
- base=master
- status-success=ci
- 'label=ready to rebase and merge'
merge_conditions: []
merge_method: squash
method: squash
- name: default
conditions:
queue_conditions:
- base=master
- status-success=ci
- 'label=ready to squash and merge'
merge_conditions:
- check-success=ci
merge_method: squash

pull_request_rules:
- name: Auto Squash and Merge
Expand All @@ -11,16 +27,14 @@ pull_request_rules:
- 'label=ready to squash and merge'
actions:
delete_head_branch: {}
queue:
method: squash
name: default
- name: Auto Rebase and Merge
conditions:
- base=master
- status-success=ci
- 'label=ready to rebase and merge'
actions:
delete_head_branch: {}
- name: Auto Rebase and Merge + Auto Squash and Merge
conditions: []
actions:
queue:
method: squash
name: default

0 comments on commit ac9cbc3

Please sign in to comment.