Skip to content

Commit

Permalink
mergify: move autosquash to queue_rules
Browse files Browse the repository at this point in the history
  • Loading branch information
tzemanovic committed Nov 26, 2024
1 parent 10dfb2f commit f2fcdf0
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,32 @@ queue_rules:
- "#approved-reviews-by >= 1"
- base = main
merge_method: merge
autosquash: true

- name: backport-0.46-queue
batch_size: 3
queue_conditions:
- "#approved-reviews-by >= 1"
- base = maint-0.46
merge_method: merge
autosquash: true

pull_request_rules:
- name: automatic merge to main or backport branch
conditions:
- label = "merge"
- label != "do-not-merge"
- "#approved-reviews-by >= 1"
- or:
- base = main
- base = maint-0.46
- label = "merge"
- label != "do-not-merge"
- "#approved-reviews-by >= 1"
- or:
- base = main
- base = maint-0.46
actions:
queue:
autosquash: true

- name: notify when a PR is removed from the queue
conditions:
- queue-dequeue-reason != none
- queue-dequeue-reason != pr-merged
- queue-dequeue-reason != none
- queue-dequeue-reason != pr-merged
actions:
comment:
message: >
Expand All @@ -48,4 +49,4 @@ pull_request_rules:
actions:
backport:
branches:
- "maint-0.46"
- "maint-0.46"

0 comments on commit f2fcdf0

Please sign in to comment.