From 20feaafd820d1a55785ee87b69a08ecaa1ac9ebd Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2024 08:23:39 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .mergify.yml | 65 ++++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 21aad7b31..2563030a9 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,51 +1,52 @@
 queue_rules:
-  - name: default
-    conditions:
-      - check-success=test (postgres, 3.9)
-
-
-pull_request_rules:
-  - name: automatic merge on CI success and review
-    conditions:
+  - name: duplicated default from automatic merge on CI success and review
+    queue_conditions:
       - check-success=test (postgres, 3.9)
       - "#approved-reviews-by>=1"
       - "#review-requested=0"
       - "#changes-requested-reviews-by=0"
       - "#commented-reviews-by=0"
       - label=ready-to-merge
-    actions:
-      queue:
-        method: squash
-        name: default
-  - name: delete head branch after merge
-    conditions: []
-    actions:
-      delete_head_branch: {}
-  - name: automatic merge for pyUp pull requests
-    conditions:
+    merge_conditions:
+      - check-success=test (postgres, 3.9)
+    merge_method: squash
+  - name: duplicated default from automatic merge for pyUp pull requests
+    queue_conditions:
       - author=pyup-bot
       - check-success=test (postgres, 3.9)
       - label=dependencies
       - "#approved-reviews-by>=1"
-    actions:
-      queue:
-        method: squash
-        name: default
-  - name: automatic merge for dependabot pull requests
-    conditions:
+    merge_conditions:
+      - check-success=test (postgres, 3.9)
+    merge_method: squash
+  - name: duplicated default from automatic merge for dependabot pull requests
+    queue_conditions:
       - author~=^dependabot(|-preview)\[bot\]$
       - check-success=test (postgres, 3.9)
       - label=dependencies
       - "#approved-reviews-by>=1"
-    actions:
-      queue:
-        method: squash
-        name: default
-  - name: automatic merge for transifex pull requests
-    conditions:
+    merge_conditions:
+      - check-success=test (postgres, 3.9)
+    merge_method: squash
+  - name: duplicated default from automatic merge for transifex pull requests
+    queue_conditions:
       - author~=^transifex-integration\[bot\]$
       - "#approved-reviews-by>=1"
+    merge_conditions:
+      - check-success=test (postgres, 3.9)
+    merge_method: squash
+  - name: default
+    conditions:
+      - check-success=test (postgres, 3.9)
+
+pull_request_rules:
+  - name: delete head branch after merge
+    conditions: []
+    actions:
+      delete_head_branch: {}
+  - name: automatic merge for dependabot pull requests + automatic merge for pyUp
+      pull requests + automatic merge for transifex pull requests + automatic merge
+      on CI success and review
+    conditions: []
     actions:
       queue:
-        method: squash
-        name: default