Merge pull request #4093 from anoma/tomas/ci-bing-bong

Revert "ci(mergify): upgrade configuration to current format"

.mergify.yml

@@ -2,54 +2,37 @@ merge_queue:
   max_parallel_checks: 3
 
 queue_rules:
-  - name: duplicated main-queue from automatic merge to main or backport branch
-    batch_size: 3
-    queue_conditions:
-      - "#approved-reviews-by >= 1"
-      - base = main
-      - label = "merge"
-      - label != "do-not-merge"
-      - "#approved-reviews-by >= 1"
-      - &id001
-        or:
-          - base = main
-          - base = maint-0.46
-    merge_conditions: []
-    merge_method: merge
-    autosquash: true
   - name: main-queue
     batch_size: 3
     queue_conditions:
       - "#approved-reviews-by >= 1"
       - base = main
     merge_method: merge
 
-  - name: duplicated backport-0.46-queue from automatic merge to main or backport
-      branch
-    batch_size: 3
-    queue_conditions:
-      - "#approved-reviews-by >= 1"
-      - base = maint-0.46
-      - label = "merge"
-      - label != "do-not-merge"
-      - "#approved-reviews-by >= 1"
-      - *id001
-    merge_conditions: []
-    merge_method: merge
-    autosquash: true
   - name: backport-0.46-queue
     batch_size: 3
     queue_conditions:
       - "#approved-reviews-by >= 1"
       - base = maint-0.46
     merge_method: merge
 
-
 pull_request_rules:
+  - name: automatic merge to main or backport branch
+    conditions:
+        - label = "merge"
+        - label != "do-not-merge"
+        - "#approved-reviews-by >= 1"
+        - or:
+          - base = main
+          - base = maint-0.46
+    actions:
+      queue:
+        autosquash: true   
+
   - name: notify when a PR is removed from the queue
     conditions:
-      - queue-dequeue-reason != none
-      - queue-dequeue-reason != pr-merged
+    - queue-dequeue-reason != none
+    - queue-dequeue-reason != pr-merged
     actions:
       comment:
         message: >
@@ -66,7 +49,3 @@ pull_request_rules:
       backport:
         branches:
           - "maint-0.46"
-  - name: refactored queue action rule
-    conditions: []
-    actions:
-      queue: