fix github mergify rule (#1079)

Signed-off-by: yusheng.ma <[email protected]>
zilliztech · Feb 19, 2025 · 62be8e3 · 62be8e3
1 parent 5f3afcd
commit 62be8e3
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -32,16 +32,11 @@ pull_request_rules:
           - base=main
           - base~=^2(\.\d+){1,2}$
       - title!=\[automated\]
-      - or:
-        - and:
-          - label!=kind/improvement
-          - or:
+      - label!=kind/improvement
+      - and:
+          - and:
             - body!=(\#|https://github.com/zilliztech/knowhere/issues/)[0-9]{1,6}
             - body!=\#[0-9]{1,6}(\s+|$)
-            - and:
-                - label!=kind/enhancement
-                - label!=kind/feature
-                - label!=kind/bug
     actions:
       label:
         add:
@@ -67,16 +62,15 @@ pull_request_rules:
       - or:
           - base=main
           - base~=^2(\.\d+){1,2}$
-      - or:
-        - label=kind/improvement
-        - and:
-          - or:
-            - label=kind/enhancement
-            - label=kind/feature
-            - label=kind/bug
-          - or:
-            - body~=\#[0-9]{1,6}(\s+|$)
-            - body~=https://github.com/zilliztech/knowhere/issues/[0-9]{1,6}(\s+|$)
+      - label!=kind/improvement
+      - and:
+        - or:
+          - label=kind/enhancement
+          - label=kind/feature
+          - label=kind/bug
+        - or:
+          - body~=\#[0-9]{1,6}(\s+|$)
+          - body~=https://github.com/zilliztech/knowhere/issues/[0-9]{1,6}(\s+|$)
     actions:
       label:
         remove: