diff --git a/.github/workflows/patch-mariadb-tests.yml b/.github/workflows/patch-mariadb-tests.yml index 61c01870b3..ffc64a946f 100644 --- a/.github/workflows/patch-mariadb-tests.yml +++ b/.github/workflows/patch-mariadb-tests.yml @@ -30,9 +30,8 @@ jobs: - name: Clone uses: actions/checkout@v3 - - name: Check for valid Python & Merge Conflicts + - name: Check for Merge Conflicts run: | - python -m compileall -f "${GITHUB_WORKSPACE}" if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}" then echo "Found merge conflicts" exit 1