Skip to content

Commit

Permalink
Merge pull request #4079 from anoma/tomas/update-maint-0.46
Browse files Browse the repository at this point in the history
mergify: update backporting for maint-0.46 branch
  • Loading branch information
mergify[bot] authored Nov 22, 2024
2 parents cc531ec + 68ce9db commit e138dd3
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ queue_rules:
- &id001
or:
- base = main
- base = maint-0.45
- base = maint-0.46
merge_conditions: []
merge_method: merge
autosquash: true
Expand All @@ -24,24 +24,24 @@ queue_rules:
- base = main
merge_method: merge

- name: duplicated backport-0.45-queue from automatic merge to main or backport
- 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.45
- 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.45-queue
- name: backport-0.46-queue
batch_size: 3
queue_conditions:
- "#approved-reviews-by >= 1"
- base = maint-0.45
- base = maint-0.46
merge_method: merge


Expand All @@ -59,13 +59,13 @@ pull_request_rules:
Sorry about that, but you can requeue the PR by using `@mergifyio requeue`
if you think this was a mistake.
- name: backport PR to 0.45 lane
- name: backport PR to 0.46 lane
conditions:
- label = backport-45
- label = backport-46
actions:
backport:
branches:
- "maint-0.45"
- "maint-0.46"
- name: refactored queue action rule
conditions: []
actions:
Expand Down

0 comments on commit e138dd3

Please sign in to comment.