diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-10-09 11:32:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 11:32:06 +0200 |
| commit | 17016090e38cc44e58517129278c28dd7943b4cc (patch) | |
| tree | a0ba6d0628f333c28b2e584cc6eb6d1ef413aa07 /util | |
| parent | e6e5fa3bf8853f149fdef16b39af3981097176a4 (diff) | |
| download | minetest-17016090e38cc44e58517129278c28dd7943b4cc.tar.gz minetest-17016090e38cc44e58517129278c28dd7943b4cc.tar.bz2 minetest-17016090e38cc44e58517129278c28dd7943b4cc.zip | |
Travis: Update clang from 4.0 to 5.0 (#6467)
* Update clang from 4.0 to 5.0
Diffstat (limited to 'util')
| -rw-r--r-- | util/travis/common.sh | 8 | ||||
| -rw-r--r-- | util/travis/lint.sh | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/util/travis/common.sh b/util/travis/common.sh index d040f639f..949540967 100644 --- a/util/travis/common.sh +++ b/util/travis/common.sh @@ -13,9 +13,9 @@ set_linux_compiler_env() { elif [[ "${COMPILER}" == "clang-3.6" ]]; then export CC=clang-3.6 export CXX=clang++-3.6 - elif [[ "${COMPILER}" == "clang-4.0" ]]; then - export CC=clang-4.0 - export CXX=clang++-4.0 + elif [[ "${COMPILER}" == "clang-5.0" ]]; then + export CC=clang-5.0 + export CXX=clang++-5.0 fi } @@ -45,7 +45,7 @@ TRIGGER_COMPILE_PATHS="src/.*\.(c|cpp|h)|CMakeLists.txt|cmake/Modules/|util/trav needs_compile() { RANGE="$TRAVIS_COMMIT_RANGE" - if [[ "$(git diff --name-only $RANGE -- 2>/dev/null)" == "" ]]; then + if [[ "$(git diff --name-only $RANGE -- 2>/dev/null)" == "" ]]; then RANGE="$TRAVIS_COMMIT^...$TRAVIS_COMMIT" echo "Fixed range: $RANGE" fi diff --git a/util/travis/lint.sh b/util/travis/lint.sh index 555cf3ebe..1174ed257 100644 --- a/util/travis/lint.sh +++ b/util/travis/lint.sh @@ -1,8 +1,8 @@ #! /bin/bash function perform_lint() { echo "Performing LINT..." - if hash clang-format-4.0 2>/dev/null; then - CLANG_FORMAT=clang-format-4.0 + if hash clang-format-5.0 2>/dev/null; then + CLANG_FORMAT=clang-format-5.0 else CLANG_FORMAT=clang-format fi |