From 4203e574e3360df15a7bd7d5a29f311aa5f7caf6 Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Sun, 14 Feb 2021 16:07:04 +0900 Subject: Refine checking for trailing whitespace [skip travis][skip appveyor] * Include tabs in checking. * Use `git grep` to avoid including `.git` directory. * Avoid running `grep` multiple times. --- .github/workflows/lint.yml | 4 +--- test/check-for-trailing-whitespace.sh | 13 ------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100755 test/check-for-trailing-whitespace.sh diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e8db09bfb..474890010 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -32,9 +32,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: 🧹 Check for trailing whitespace - run: | - cd test || exit - sh ./check-for-trailing-whitespace.sh || exit 1 + run: "! git grep -EIn $'[ \t]+$'" yamllint: name: 🍶 YAML runs-on: ubuntu-latest diff --git a/test/check-for-trailing-whitespace.sh b/test/check-for-trailing-whitespace.sh deleted file mode 100755 index 00be038f3..000000000 --- a/test/check-for-trailing-whitespace.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -cd .. || exit -# print first -grep -EHInr '( +)$' ./* - -var=$(grep -EHInr '( +)$' ./*) -# then exit with fail if found -if test -z "$var"; then - exit 0 -else - exit 1 -fi -- cgit v1.2.3