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

ci/mergify: update for maint-1.1 and maint-libs-0.47 #4277

Merged
merged 1 commit into from
Jan 28, 2025
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
ci/mergify: update for maint-1.1 and maint-libs-0.47
tzemanovic committed Jan 27, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 48fbbf115d520fe93b1cd9bf17c8efeccaf825c7
24 changes: 12 additions & 12 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -10,19 +10,19 @@ queue_rules:
merge_method: merge
autosquash: true

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

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

@@ -34,8 +34,8 @@ pull_request_rules:
- "#approved-reviews-by >= 1"
- or:
- base = main
- base = maint-1.0
- base = maint-libs-0.46
- base = maint-1.1
- base = maint-libs-0.47
actions:
queue:

@@ -52,18 +52,18 @@ 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 apps 1.0 lane
- name: backport PR to apps 1.1 lane
conditions:
- label = backport-1.0
- label = backport-1.1
actions:
backport:
branches:
- "maint-1.0"
- "maint-1.1"

- name: backport PR to libs 0.46 lane
- name: backport PR to libs 0.47 lane
conditions:
- label = backport-libs-0.46
- label = backport-libs-0.47
actions:
backport:
branches:
- "maint-libs-0.46"
- "maint-libs-0.47"