update mergify.yml for Two-Step CI

.github/mergify.yml

@@ -2,54 +2,44 @@ queue_rules:
   - name: default
     allow_inplace_checks: false
     queue_conditions:
-      - '#approved-reviews-by >= 2'
       - check-success = "check-title"
-      - check-success = "ci-slackbot-proxy-lint (20.x)"
-      - check-success = "ci-slackbot-proxy-launch-dev (20.x)"
-      - check-success = "ci-slackbot-proxy-launch-prod (20.x)"
-      - check-success = "ci-app-lint (20.x)"
-      - check-success = "ci-app-test (20.x)"
-      - check-success = "ci-app-launch-dev (20.x)"
+      - or:
+        - and:
+            - check-success = "ci-slackbot-proxy-lint (20.x)"
+            - check-success = "ci-slackbot-proxy-launch-dev (20.x)"
+        - and:
+            - check-success = "ci-app-lint (20.x)"
+            - check-success = "ci-app-test (20.x)"
+            - check-success = "ci-app-launch-dev (20.x)"
     merge_conditions:
-      - '#approved-reviews-by >= 2'
       - check-success = "check-title"
-      - check-success = "ci-slackbot-proxy-lint (20.x)"
-      - check-success = "ci-slackbot-proxy-launch-dev (20.x)"
-      - check-success = "ci-slackbot-proxy-launch-prod (20.x)"
-      - check-success = "ci-app-lint (20.x)"
-      - check-success = "ci-app-test (20.x)"
-      - check-success = "ci-app-launch-dev (20.x)"
-      - check-success = "test-prod-node18 / launch-prod"
-      - check-success = "test-prod-node20 / launch-prod"
+      - "#check-failure=0"
+      - or:
+        - and:
+            - check-success = "ci-slackbot-proxy-lint (20.x)"
+            - check-success = "ci-slackbot-proxy-launch-dev (20.x)"
+            - check-success = "ci-slackbot-proxy-launch-prod (20.x)"
+        - and:
+            - check-success = "ci-app-lint (20.x)"
+            - check-success = "ci-app-test (20.x)"
+            - check-success = "ci-app-launch-dev (20.x)"
+            - check-success = "test-prod-node18 / launch-prod"
+            - check-success = "test-prod-node20 / launch-prod"
 
 pull_request_rules:
   - name: Automatic queue to merge
     conditions:
       - '#approved-reviews-by >= 1'
-      - check-success = "check-title"
-      - check-success = "ci-slackbot-proxy-lint (20.x)"
-      - check-success = "ci-slackbot-proxy-launch-dev (20.x)"
-      - check-success = "ci-slackbot-proxy-launch-prod (20.x)"
-      - check-success = "ci-app-lint (20.x)"
-      - check-success = "ci-app-test (20.x)"
-      - check-success = "ci-app-launch-dev (20.x)"
+      - '#review-requested = 0'
     actions:
       queue:
-        method: merge
 
   - name: Automatic merge for Dependabot pull requests
     conditions:
       - author = dependabot[bot]
       - '#approved-reviews-by >= 1'
+      - "#check-failure=0"
       - check-success = "check-title"
-      - check-success = "ci-slackbot-proxy-lint (20.x)"
-      - check-success = "ci-slackbot-proxy-launch-dev (20.x)"
-      - check-success = "ci-slackbot-proxy-launch-prod (20.x)"
-      - check-success = "ci-app-lint (20.x)"
-      - check-success = "ci-app-test (20.x)"
-      - check-success = "ci-app-launch-dev (20.x)"
-      - check-success = "test-prod-node18 / launch-prod"
-      - check-success = "test-prod-node20 / launch-prod"
     actions:
       merge:
         method: merge