feat: fix grep condition

Signed-off-by: hlts2 <[email protected]>
vdaas · Jul 29, 2024 · b8e39de · b8e39de
1 parent 5d2991a
commit b8e39de
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/check-conflict.yml b/.github/workflows/check-conflict.yml
@@ -35,7 +35,7 @@ jobs:
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
       - name: Check conflict
         run: |
-          if ! grep -r "<<<< HEAD" . --exclude-dir=.git --exclude=check-conflict.yml; then
+          if grep -r "<<<< HEAD" . --exclude-dir=.git --exclude=check-conflict.yml; then
             PR_COMMENTS=`curl ${API_URL}?per_page=10000`
             BODY=`echo -E "${PR_COMMENTS}" | jq 'last(.[] | select(.user.login == "vdaas-ci") | select(.body | test("^\\\\*\\\\*\\\\[WARNING:CONFLICT")) | .body)' -r`