From 45861c97357be8ca4fc2eaa97b9b8969c64b6060 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Sun, 1 Dec 2024 20:39:59 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .mergify.yml | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 5e4c210..3225dae 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,9 +1,23 @@
 # GENERATED CONTENT
 # remove repo from adrianjost/.github/synced/workflows/generator.js before editing
 queue_rules:
+  - name: duplicated branchProtection from auto merge passing Dependabot pull requests
+    queue_conditions:
+      - author~=dependabot(-preview)?\[bot\]
+    merge_conditions:
+      - '-merged'
+    merge_method: squash
+  - name: duplicated branchProtection from auto merge when ready to merge label is
+      set
+    queue_conditions:
+      - label=ready to merge
+    merge_conditions:
+      - '-merged'
+    merge_method: merge
   - name: branchProtection
     conditions:
       - '-merged'
+
 pull_request_rules:
   - name: label PRs with conflicts
     conditions:
@@ -26,21 +40,8 @@ pull_request_rules:
       - conflict
     actions:
       comment:
-        message: Someone with write access should tell dependabot to recreate this PR.
-  - name: auto merge passing Dependabot pull requests
-    conditions:
-      - author~=dependabot(-preview)?\[bot\]
-    actions:
-      queue:
-        name: branchProtection
-        method: squash
-  - name: auto merge when ready to merge label is set
-    conditions:
-      - label=ready to merge
-    actions:
-      queue:
-        name: branchProtection
-        method: merge
+        message: Someone with write access should tell dependabot to recreate this
+          PR.
   - name: remove ready to merge when merged
     conditions:
       - merged
@@ -55,3 +56,8 @@ pull_request_rules:
       - label!=WIP
     actions:
       delete_head_branch: {}
+  - name: auto merge passing Dependabot pull requests + auto merge when ready to merge
+      label is set
+    conditions: []
+    actions:
+      queue: