From a0276018a020249c796b1498adfddff5e12b2f0a Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:38:55 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .mergify.yml | 58 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index bd99991bc..49184c27b 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,28 +1,26 @@
 queue_rules:
-  - name: default
-    conditions:
-      # Conditions to get out of the queue (= merged)
+  - name: duplicated default from automatic merge for master when CI passes and trusted
+      comitter
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+      - "#review-requested=0"
+      - "#changes-requested-reviews-by=0"
+      - "#commented-reviews-by=0"
       - status-success=mypy
       - status-success=lint
       - status-success=test
       - status-success=jslint
-
-
-pull_request_rules:
-  - name: automatic merge dependency updates
-    conditions:
+      - base=master
+      - author=@PennyDreadfulMTG/automerge
       - status-success=mypy
       - status-success=lint
       - status-success=test
       - status-success=jslint
-      - author~=(pyup-bot|dependabot)
-      - -files~=^(!?.github/workflows/)
-    actions:
-      merge:
-        method: rebase
-      delete_head_branch: {}
-  - name: automatic merge for master when CI passes and approved
-    conditions:
+      - base=master
+    merge_conditions: []
+    merge_method: merge
+  - name: default
+    queue_conditions:
       - "#approved-reviews-by>=1"
       - "#review-requested=0"
       - "#changes-requested-reviews-by=0"
@@ -32,19 +30,29 @@ pull_request_rules:
       - status-success=test
       - status-success=jslint
       - base=master
-    actions:
-      queue:
-        name: default
-        method: rebase
-  - name: automatic merge for master when CI passes and trusted comitter
+    merge_conditions:
+      # Conditions to get out of the queue (= merged)
+      - status-success=mypy
+      - status-success=lint
+      - status-success=test
+      - status-success=jslint
+    merge_method: rebase
+
+pull_request_rules:
+  - name: automatic merge dependency updates
     conditions:
-      - author=@PennyDreadfulMTG/automerge
       - status-success=mypy
       - status-success=lint
       - status-success=test
       - status-success=jslint
-      - base=master
+      - author~=(pyup-bot|dependabot)
+      - -files~=^(!?.github/workflows/)
+    actions:
+      merge:
+        method: rebase
+      delete_head_branch: {}
+  - name: automatic merge for master when CI passes and approved + automatic merge
+      for master when CI passes and trusted comitter
+    conditions: []
     actions:
       queue:
-        name: default
-        method: merge