diff options
| author | Petri Lehtinen <petri@digip.org> | 2019-10-21 07:33:12 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2019-10-21 08:56:03 +0300 |
| commit | bb4f99e9190bbca8a4a5b2bb1ee2e9c0d8760c97 (patch) | |
| tree | 70a49bd8d4bec6c3d6e23213bbefe30f6237a2f9 | |
| parent | f912430cda4a9c3379d5781057297ff2ed453ba0 (diff) | |
| download | jansson-bb4f99e9190bbca8a4a5b2bb1ee2e9c0d8760c97.zip jansson-bb4f99e9190bbca8a4a5b2bb1ee2e9c0d8760c97.tar.gz jansson-bb4f99e9190bbca8a4a5b2bb1ee2e9c0d8760c97.tar.bz2 | |
Fix clang-format version checking
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rwxr-xr-x | scripts/clang-format-check | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index a1f736b..bc4e23c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,12 @@ env: + global: + - CLANG_FORMAT_VERSION=9 matrix: - JANSSON_BUILD_METHOD=cmake JANSSON_CMAKE_OPTIONS="-DJANSSON_TEST_WITH_VALGRIND=ON" JANSSON_EXTRA_INSTALL="valgrind" - JANSSON_BUILD_METHOD=autotools - JANSSON_BUILD_METHOD=coverage JANSSON_CMAKE_OPTIONS="-DJANSSON_COVERAGE=ON -DJANSSON_COVERALLS=ON -DCMAKE_BUILD_TYPE=Debug" JANSSON_EXTRA_INSTALL="lcov curl" - JANSSON_BUILD_METHOD=fuzzer - - JANSSON_BUILD_METHOD=lint + - JANSSON_BUILD_METHOD=lint CLANG_FORMAT=clang-format-9 dist: bionic language: c compiler: @@ -17,7 +19,7 @@ matrix: - compiler: clang env: JANSSON_BUILD_METHOD=fuzzer - compiler: gcc - env: JANSSON_BUILD_METHOD=lint + env: JANSSON_BUILD_METHOD=lint CLANG_FORMAT=clang-format-9 allow_failures: - env: JANSSON_BUILD_METHOD=coverage JANSSON_CMAKE_OPTIONS="-DJANSSON_COVERAGE=ON -DJANSSON_COVERALLS=ON -DCMAKE_BUILD_TYPE=Debug" JANSSON_EXTRA_INSTALL="lcov curl" install: @@ -29,4 +31,4 @@ script: - if [ "$JANSSON_BUILD_METHOD" = "cmake" ]; then mkdir build && cd build && cmake $JANSSON_CMAKE_OPTIONS .. && cmake --build . && ctest --output-on-failure; fi - if [ "$JANSSON_BUILD_METHOD" = "coverage" ]; then mkdir build && cd build && cmake $JANSSON_CMAKE_OPTIONS .. && cmake --build . && cmake --build . --target coveralls; fi - if [ "$JANSSON_BUILD_METHOD" = "fuzzer" ]; then ./test/ossfuzz/travisoss.sh; fi - - if [ "$JANSSON_BUILD_METHOD" = "lint" ]; then ./scripts/clang-format-check 9; fi + - if [ "$JANSSON_BUILD_METHOD" = "lint" ]; then ./scripts/clang-format-check; fi diff --git a/scripts/clang-format-check b/scripts/clang-format-check index f3f0f6d..983e55d 100755 --- a/scripts/clang-format-check +++ b/scripts/clang-format-check @@ -1,21 +1,19 @@ #!/bin/bash -clangformat="clang-format" -if [ -n "$1" ]; then - clangformat="clang-format-$1" -fi +CLANG_FORMAT=${CLANG_FORMAT:-clang-format} +CLANG_FORMAT_VERSION=${CLANG_FORMAT_VERSION:-} -if ! type $clangformat >/dev/null; then - # clang-format not found. If running tests, mark this test as - # skipped. +if ! type $CLANG_FORMAT >/dev/null || \ + ! $CLANG_FORMAT --version | grep -q "version ${CLANG_FORMAT_VERSION}"; then + # If running tests, mark this test as skipped. exit 77 fi errors=0 -paths=$(find . -type f -a '(' -name '*.c' -o -name '*.h' ')') +paths=$(git ls-files | grep '\.[ch]$') for path in $paths; do in=$(cat $path) - out=$($clangformat $path) + out=$($CLANG_FORMAT $path) if [ "$in" != "$out" ]; then diff -u -L $path -L "$path.formatted" $path - <<<$out |