From 0ce5f70ca8137cd2ada6a51a37345a0538bf4ff3 Mon Sep 17 00:00:00 2001 From: Bimba Shrestha Date: Tue, 2 Jun 2020 09:07:45 -0700 Subject: [PATCH 1/5] newline lints (ignore) --- .github/workflows/generic-dev.yml | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/generic-dev.yml b/.github/workflows/generic-dev.yml index ffef3fcf5..5ee3123e6 100644 --- a/.github/workflows/generic-dev.yml +++ b/.github/workflows/generic-dev.yml @@ -6,20 +6,20 @@ on: jobs: -# Dev PR jobs that still have to be migrated from travis -# +# Dev PR jobs that still have to be migrated from travis +# # icc (need self-hosted) # arm/qemu-arm (need self-hosted) -# versionTag +# versionTag # valgrindTest (keeps failing for some reason. need investigation) # staticAnalyze (need trusty so need self-hosted) # pcc-fuzz: (need trusty so need self-hosted) # arm-build-test (need self-hosted) -# -# setting up self-hosted is pretty straightforward, but +# +# setting up self-hosted is pretty straightforward, but # I need admins permissions to the repo for that it looks like # So I'm tabling that for now -# +# # The master branch exclusive jobs will be in a separate # workflow file (the osx tests and meson build that is) @@ -29,14 +29,14 @@ jobs: - uses: actions/checkout@v2 - name: make benchmarking run: make benchmarking - + test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: make test - run: make test - + - name: make test + run: make test + gcc-6-7-libzstd: runs-on: ubuntu-latest steps: @@ -50,18 +50,18 @@ jobs: make clean LDFLAGS=-Wl,--no-undefined make -C lib libzstd-mt make -C tests zbufftest-dll - + gcc-8-asan-ubsan-testzstd: - runs-on: ubuntu-16.04 # fails on 18.04 + runs-on: ubuntu-16.04 # fails on 18.04 steps: - uses: actions/checkout@v2 - - name: gcc-8 + ASan + UBSan + Test Zstd - run: | + - name: gcc-8 + ASan + UBSan + Test Zstd + run: | make gcc8install CC=gcc-8 CFLAGS="-Werror" make -j all make clean CC=gcc-8 make -j uasan-test-zstd Date: Tue, 2 Jun 2020 09:08:16 -0700 Subject: [PATCH 2/5] adding shellcheck bourne test --- .github/workflows/generic-dev.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/generic-dev.yml b/.github/workflows/generic-dev.yml index 5ee3123e6..76ce14164 100644 --- a/.github/workflows/generic-dev.yml +++ b/.github/workflows/generic-dev.yml @@ -170,3 +170,13 @@ jobs: # sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix; (doesn't work) sudo apt-get install gcc-mingw-w64 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ CFLAGS="-Werror -O1" make zstd + + bourne-shell: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Bourne shell compatibility (shellcheck) + run: | + wget https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.x86_64.tar.xz + tar -xf shellcheck-v0.7.1.linux.x86_64.tar.xz + shellcheck-v0.7.1/shellcheck --shell=sh --severity=warning tests/playTests.sh From 151deaf1438c54483fa89c99806ecdb34d61a884 Mon Sep 17 00:00:00 2001 From: Bimba Shrestha Date: Tue, 2 Jun 2020 09:12:13 -0700 Subject: [PATCH 3/5] [shellcheck] adding quotes to expansion --- tests/playTests.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/playTests.sh b/tests/playTests.sh index f353229be..99325976a 100755 --- a/tests/playTests.sh +++ b/tests/playTests.sh @@ -8,22 +8,22 @@ die() { } datagen() { - "$DATAGEN_BIN" $@ + "$DATAGEN_BIN" "$@" } zstd() { if [ -z "$EXEC_PREFIX" ]; then - "$ZSTD_BIN" $@ + "$ZSTD_BIN" "$@" else - "$EXEC_PREFIX" "$ZSTD_BIN" $@ + "$EXEC_PREFIX" "$ZSTD_BIN" "$@" fi } sudoZstd() { if [ -z "$EXEC_PREFIX" ]; then - sudo "$ZSTD_BIN" $@ + sudo "$ZSTD_BIN" "$@" else - sudo "$EXEC_PREFIX" "$ZSTD_BIN" $@ + sudo "$EXEC_PREFIX" "$ZSTD_BIN" "$@" fi } From b0f851675a1bd44f21425f673ab54678862e5cbc Mon Sep 17 00:00:00 2001 From: Bimba Shrestha Date: Tue, 2 Jun 2020 09:12:50 -0700 Subject: [PATCH 4/5] [shellcheck] setting if unset --- tests/playTests.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/playTests.sh b/tests/playTests.sh index 99325976a..c84cd6a1b 100755 --- a/tests/playTests.sh +++ b/tests/playTests.sh @@ -78,6 +78,11 @@ println() { printf '%b\n' "${*}" } +if [ -z "${size}" ]; then + size= +else + size=${size} +fi SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd) PRGDIR="$SCRIPT_DIR/../programs" From eee59be6a8a01681f5b8403126af729694490e81 Mon Sep 17 00:00:00 2001 From: Bimba Shrestha Date: Tue, 2 Jun 2020 09:15:24 -0700 Subject: [PATCH 5/5] excluding ls | grep warning --- .github/workflows/generic-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generic-dev.yml b/.github/workflows/generic-dev.yml index 76ce14164..785136391 100644 --- a/.github/workflows/generic-dev.yml +++ b/.github/workflows/generic-dev.yml @@ -179,4 +179,4 @@ jobs: run: | wget https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.x86_64.tar.xz tar -xf shellcheck-v0.7.1.linux.x86_64.tar.xz - shellcheck-v0.7.1/shellcheck --shell=sh --severity=warning tests/playTests.sh + shellcheck-v0.7.1/shellcheck --shell=sh --severity=warning --exclude=SC2010 tests/playTests.sh