diff options
| author | KOBAYASHI Shuji <[email protected]> | 2021-02-14 16:07:04 +0900 |
|---|---|---|
| committer | KOBAYASHI Shuji <[email protected]> | 2021-02-14 16:07:04 +0900 |
| commit | 4203e574e3360df15a7bd7d5a29f311aa5f7caf6 (patch) | |
| tree | 8eee822e1aa5478bd511a73887a844e6a8a3c126 | |
| parent | c3ec5861ac4a94c78d6c0c3c510bc2b0451f5a7f (diff) | |
| download | mruby-4203e574e3360df15a7bd7d5a29f311aa5f7caf6.tar.gz mruby-4203e574e3360df15a7bd7d5a29f311aa5f7caf6.zip | |
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.
| -rw-r--r-- | .github/workflows/lint.yml | 4 | ||||
| -rwxr-xr-x | test/check-for-trailing-whitespace.sh | 13 |
2 files changed, 1 insertions, 16 deletions
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 |