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 8, 2025
1 parent 597600c commit aa265f9
Showing 1 changed file with 19 additions and 5 deletions.
24 changes: 19 additions & 5 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
queue_rules:
- name: duplicated default from Auto Squash and Merge
queue_conditions:
- base=master
- status-success=ci
- 'label=ready to squash and merge'
merge_conditions:
- check-success=ci
merge_method: squash
- name: duplicated default from Auto Rebase and Merge
queue_conditions:
- base=master
- status-success=ci
- 'label=ready to rebase and merge'
merge_conditions:
- check-success=ci
merge_method: rebase
- name: default
conditions:
- check-success=ci
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: rebase
name: default

0 comments on commit aa265f9

Please sign in to comment.