diff --git a/.mergify.yml b/.mergify.yml index a29772105e..e33d553c95 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -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"