From b47eda535618ab3f4c547bcff724959986ec32ca Mon Sep 17 00:00:00 2001
From: Matt <6519811+mattgogerly@users.noreply.github.com>
Date: Wed, 19 Jan 2022 03:19:01 +0000
Subject: [PATCH] chore(build): update Mergify config (#5617)

* chore(build): update Mergify config

* Update .mergify.yml

(cherry picked from commit dfe646e411a560f2d9be892d80dce53c74dc22f9)
---
 .mergify.yml | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 9acb7204b73..e816841f06c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,3 +1,8 @@
+queue_rules:
+  - name: default
+    conditions:
+      - status-success=build
+
 pull_request_rules:
   - name: Automatically merge on CI success and review
     conditions:
@@ -6,10 +11,10 @@ pull_request_rules:
       - "label=ready to merge"
       - "approved-reviews-by=@oss-approvers"
     actions:
-      merge:
+      queue:
         method: squash
-        strict: smart
-      label:
+        name: default
+      label: 
         add: ["auto merged"]
   - name: Automatically merge release branch changes on CI success and release manager review
     conditions:
@@ -18,9 +23,9 @@ pull_request_rules:
       - "label=ready to merge"
       - "approved-reviews-by=@release-managers"
     actions:
-      merge:
+      queue:
         method: squash
-        strict: smart
+        name: default
       label:
         add: ["auto merged"]
   # This rule exists to handle release branches that are still building using Travis CI instead of
@@ -32,9 +37,9 @@ pull_request_rules:
       - "label=ready to merge"
       - "approved-reviews-by=@release-managers"
     actions:
-      merge:
+      queue:
         method: squash
-        strict: smart
+        name: default
       label:
         add: ["auto merged"]
   - name: Automatically merge PRs from maintainers on CI success and review
@@ -44,9 +49,9 @@ pull_request_rules:
       - "label=ready to merge"
       - "author=@oss-approvers"
     actions:
-      merge:
+      queue:
         method: squash
-        strict: smart
+        name: default
       label:
         add: ["auto merged"]
   - name: Automatically merge autobump PRs on CI success
@@ -56,9 +61,9 @@ pull_request_rules:
       - "label~=autobump-*"
       - "author:spinnakerbot"
     actions:
-      merge:
+      queue:
         method: squash
-        strict: smart
+        name: default
       label:
         add: ["auto merged"]
   - name: Request reviews for autobump PRs on CI failure