Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format (#4138)
Browse files Browse the repository at this point in the history
Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
mergify[bot] authored Nov 26, 2024
1 parent 42f10cd commit 2722ef5
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
pull_request_rules:
- name: Automatic merge using squash
conditions:
queue_rules:
- name: default
queue_conditions:
- "#approved-reviews-by>=1"
actions:
queue:
method: squash
merge_conditions: []
merge_method: squash

pull_request_rules:
- name: Automatic branch update
conditions:
- -conflict # skip PRs with conflicts
Expand All @@ -17,5 +18,9 @@ pull_request_rules:
conditions:
- merged
actions:
delete_head_branch:
delete_head_branch:
force: true
- name: Automatic merge using squash
conditions: []
actions:
queue:

0 comments on commit 2722ef5

Please sign in to comment.