Skip to content

Commit

Permalink
Revert "ci(mergify): upgrade configuration to current format"
Browse files Browse the repository at this point in the history
This reverts commit 63eaf11.
  • Loading branch information
tzemanovic committed Nov 26, 2024
1 parent b39bae5 commit 095c18d
Showing 1 changed file with 14 additions and 35 deletions.
49 changes: 14 additions & 35 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,37 @@ merge_queue:
max_parallel_checks: 3

queue_rules:
- name: duplicated main-queue from automatic merge to main or backport branch
batch_size: 3
queue_conditions:
- "#approved-reviews-by >= 1"
- base = main
- label = "merge"
- label != "do-not-merge"
- "#approved-reviews-by >= 1"
- &id001
or:
- base = main
- base = maint-0.46
merge_conditions: []
merge_method: merge
autosquash: true
- name: main-queue
batch_size: 3
queue_conditions:
- "#approved-reviews-by >= 1"
- base = main
merge_method: merge

- name: duplicated backport-0.46-queue from automatic merge to main or backport
branch
batch_size: 3
queue_conditions:
- "#approved-reviews-by >= 1"
- base = maint-0.46
- label = "merge"
- label != "do-not-merge"
- "#approved-reviews-by >= 1"
- *id001
merge_conditions: []
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


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
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 @@ -66,7 +49,3 @@ pull_request_rules:
backport:
branches:
- "maint-0.46"
- name: refactored queue action rule
conditions: []
actions:
queue:

0 comments on commit 095c18d

Please sign in to comment.