From 16b9545886060718814f2c2f4d4ad6d82024eae8 Mon Sep 17 00:00:00 2001
From: Matt <6519811+mattgogerly@users.noreply.github.com>
Date: Tue, 18 Jan 2022 23:16:03 +0000
Subject: [PATCH 1/2] chore(build): update Mergify config

---
 .mergify.yml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 9acb7204b73..12e430e223b 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,11 +11,11 @@ pull_request_rules:
       - "label=ready to merge"
       - "approved-reviews-by=@oss-approvers"
     actions:
-      merge:
+      queue:
         method: squash
-        strict: smart
-      label:
-        add: ["auto merged"]
+        name: default
+      label: 
+        add: ["auto-merged"]
   - name: Automatically merge release branch changes on CI success and release manager review
     conditions:
       - base~=^release-
@@ -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

From 268667b1373943fe5cba613cdb44d5898190c96e Mon Sep 17 00:00:00 2001
From: Matt <6519811+mattgogerly@users.noreply.github.com>
Date: Tue, 18 Jan 2022 23:16:50 +0000
Subject: [PATCH 2/2] Update .mergify.yml

---
 .mergify.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index 12e430e223b..e816841f06c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -15,7 +15,7 @@ pull_request_rules:
         method: squash
         name: default
       label: 
-        add: ["auto-merged"]
+        add: ["auto merged"]
   - name: Automatically merge release branch changes on CI success and release manager review
     conditions:
       - base~=^release-