ci(mergify): fix rebase conditions

kelvindev15 · Aug 12, 2023 · 172fef6 · 172fef6
1 parent bf556a9
commit 172fef6
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,12 +1,14 @@
 pull_request_rules:
   - name: "Rebase on passing tests"
     conditions:
-      - author=renovate[bot]
-      - check-success=success
-      - check-skipped=success
-      - check-neutral=success
-      - -draft
-      - -conflict
+      - and:
+        - author=renovate[bot]
+        - or:
+          - check-success=success
+          - check-skipped=success
+          - check-neutral=success
+        - -draft
+        - -conflict
     actions:
       merge:
         method: rebase