From ec2361eaf95b70f1e9b506a871a7c379d8485453 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 6 Dec 2021 12:42:33 -0800
Subject: [PATCH] Update mergify configuration. (backport #7385) (#7387)

Per https://blog.mergify.com/strict-mode-deprecation/, the strict mode
has been deprecated and will be turned off on 10-Jan-2022. This updates
the config to use the new, approved thing instead of the old thing.

(cherry picked from commit 2d4844f97f804149aa6dd47bcf957c1de9eaf6ea)
---
 .github/mergify.yml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 6b08c877f..6641991a7 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,18 +1,16 @@
-pull_request_rules:
-  - name: Automerge to master
+queue_rules:
+  - name: default
     conditions:
-      - base=master
+      - base=v0.35.x
+      - label=S:automerge
+
+pull_request_rules:
+  - name: Automerge to v0.35.x
+    conditions:
+      - base=v0.35.x
       - label=S:automerge
     actions:
-      merge:
+      queue:
         method: squash
-        strict: smart+fasttrack
+        name: default
         commit_message: title+body
-  - name: backport patches to v0.34.x branch
-    conditions:
-      - base=master
-      - label=S:backport-to-v0.34.x
-    actions:
-      backport:
-        branches:
-          - v0.34.x