From 3852b396038dd96f1a2ec88cba7ee6a83ef92d81 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2024 16:28:39 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format
---
.mergify.yml | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/.mergify.yml b/.mergify.yml
index 450797e5c810..9b4b80f99ee4 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,21 +1,17 @@
queue_rules:
- name: default
- conditions:
- - "#approved-reviews-by>1"
-
-pull_request_rules:
- - name: automerge to main with label automerge and branch protection passing
- conditions:
+ queue_conditions:
- "#approved-reviews-by>1"
- base=main
- label=A:automerge
- actions:
- queue:
- name: default
- method: squash
- commit_message_template: |
- {{ title }} (#{{ number }})
- {{ body }}
+ merge_conditions:
+ - "#approved-reviews-by>1"
+ merge_method: squash
+ commit_message_template: |
+ {{ title }} (#{{ number }})
+ {{ body }}
+
+pull_request_rules:
- name: backport patches to v0.47.x branch
conditions:
- base=main
@@ -48,3 +44,7 @@ pull_request_rules:
backport:
branches:
- release/v0.44.x
+ - name: refactored queue action rule
+ conditions: []
+ actions:
+ queue: