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

---
 .mergify.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 3438adc735..5ca9c7dfb1 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,6 +1,10 @@
 queue_rules:
   - name: automerge
-    conditions:
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+      - label=automerge
+      - label!=on hold
+    merge_conditions:
       - check-success=python3.9-x64 windows-latest
       - check-success=python3.9-x64 ubuntu-latest
       - check-success=python3.9-x64 macOS-latest
@@ -13,17 +17,9 @@ queue_rules:
       - check-success=Build, rustfmt, and python lint
       - check-success=Coverage
       - check-success=Build Docs
+    merge_method: squash
 
 pull_request_rules:
-  - name: automatic merge on CI success and review
-    conditions:
-      - "#approved-reviews-by>=1"
-      - label=automerge
-      - label!=on hold
-    actions:
-      queue:
-        name: automerge
-        method: squash
   - name: backport
     conditions:
       - label=stable-backport-potential
@@ -31,3 +27,7 @@ pull_request_rules:
       backport:
         branches:
           - stable/0.14
+  - name: refactored queue action rule
+    conditions: []
+    actions:
+      queue:

From 2a46cbff5d4fd802bce154823017770d03a51f93 Mon Sep 17 00:00:00 2001
From: Ivan Carvalho <ivancarv@student.ubc.ca>
Date: Sat, 23 Nov 2024 12:30:33 -0500
Subject: [PATCH 2/2] Use mergify only for backporting

---
 .github/.mergify.yml |  8 ++++++++
 .mergify.yml         | 33 ---------------------------------
 2 files changed, 8 insertions(+), 33 deletions(-)
 create mode 100644 .github/.mergify.yml
 delete mode 100644 .mergify.yml

diff --git a/.github/.mergify.yml b/.github/.mergify.yml
new file mode 100644
index 0000000000..4a9ee1ef66
--- /dev/null
+++ b/.github/.mergify.yml
@@ -0,0 +1,8 @@
+pull_request_rules:
+  - name: backport
+    conditions:
+      - label=stable-backport-potential
+    actions:
+      backport:
+        branches:
+          - stable/0.15
diff --git a/.mergify.yml b/.mergify.yml
deleted file mode 100644
index 5ca9c7dfb1..0000000000
--- a/.mergify.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-queue_rules:
-  - name: automerge
-    queue_conditions:
-      - "#approved-reviews-by>=1"
-      - label=automerge
-      - label!=on hold
-    merge_conditions:
-      - check-success=python3.9-x64 windows-latest
-      - check-success=python3.9-x64 ubuntu-latest
-      - check-success=python3.9-x64 macOS-latest
-      - check-success=python3.10-x64 windows-latest
-      - check-success=python3.10-x64 ubuntu-latest
-      - check-success=python3.10-x64 macOS-latest
-      - check-success=python3.11-x64 windows-latest
-      - check-success=python3.11-x64 ubuntu-latest
-      - check-success=python3.11-x64 macOS-latest
-      - check-success=Build, rustfmt, and python lint
-      - check-success=Coverage
-      - check-success=Build Docs
-    merge_method: squash
-
-pull_request_rules:
-  - name: backport
-    conditions:
-      - label=stable-backport-potential
-    actions:
-      backport:
-        branches:
-          - stable/0.14
-  - name: refactored queue action rule
-    conditions: []
-    actions:
-      queue: