ci/mergify: add merge rule for backport to 0.44

(cherry picked from commit b0ae7bc) # Conflicts: # .mergify.yml
anoma · Oct 1, 2024 · ded101e · ded101e
1 parent e1983f2
commit ded101e
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -6,15 +6,28 @@ queue_rules:
       - "#approved-reviews-by >= 1"
       - base = main
     merge_method: merge
-
+
+  - name: backport-0.44-queue
+    speculative_checks: 3
+    batch_size: 3
+    queue_conditions:
+      - "#approved-reviews-by >= 1"
+      - base = "0.44.0"
+    merge_method: merge
 
 pull_request_rules:
+<<<<<<< HEAD
   - name: main-automatic-merge
+=======
+  - name: automatic merge to main or backport branch
+>>>>>>> b0ae7bcc9 (ci/mergify: add merge rule for backport to 0.44)
     conditions:
         - label = "merge"
         - label != "do-not-merge"
         - "#approved-reviews-by >= 1"
-        - base = main
+        - or:
+          - base = main
+          - base = "0.44.0"
     actions:
       queue:
         autosquash: true