From b8e39deb782e92186480427ff53d27f6c22e3430 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Mon, 29 Jul 2024 15:53:54 +0900 Subject: [PATCH] feat: fix grep condition Signed-off-by: hlts2 --- .github/workflows/check-conflict.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-conflict.yml b/.github/workflows/check-conflict.yml index e18a37620d..d2eda8436f 100644 --- 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`