From 7ed1669e99ef54cf6b784ccdd36048e5bfa58b24 Mon Sep 17 00:00:00 2001
From: congqixia <congqi.xia@zilliz.com>
Date: Wed, 17 Jan 2024 10:12:55 +0800
Subject: [PATCH] enhance: [cherry-pick] adjust workflow for merr & branches
 (#652) (#653)

/kind enhancement

Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
---
 .github/mergify.yml            | 12 ------------
 .github/workflows/test-ci.yaml |  1 +
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index bcb7bb919..dc739954f 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -13,18 +13,6 @@ pull_request_rules:
         add:
           - ci-passed
           
-  - name: Test passed for code changed for branch
-    conditions:
-      - or:
-        - base=master
-        - base~=^v2(\.\d+).x$
-      - "status-success=Unittest AMD64 Ubuntu 18.04"
-      - "status-success=lint"
-    actions:
-      label:
-        add:
-          - ci-passed
-
   - name: Test passed for e2e changed
     conditions:
       - or:
diff --git a/.github/workflows/test-ci.yaml b/.github/workflows/test-ci.yaml
index 7f0a45c91..38130aac1 100644
--- a/.github/workflows/test-ci.yaml
+++ b/.github/workflows/test-ci.yaml
@@ -11,6 +11,7 @@ on:
       - 'internal/**'
       - 'test/**'
       - 'tests/**'
+      - 'merr/**'
 jobs:
   test:
     name: Run Ci Test