Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mergify: move autosquash to queue_rules #4100

Merged
merged 1 commit into from
Nov 29, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 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 Down
Loading