diff options
| author | Loïc Blot <loic.blot@unix-experience.fr> | 2018-03-23 11:07:19 +0100 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2019-03-14 12:30:13 +0100 |
| commit | a6a04c4b5b0cd475ea265b63ff6ff52daf66db42 (patch) | |
| tree | f18daa7584cba90648b698adae943dfdd43571f7 /util/travis/before_install.sh | |
| parent | aafbdd442f6bb6d6730fc7fdff76cbd0e3be301b (diff) | |
| download | minetest-a6a04c4b5b0cd475ea265b63ff6ff52daf66db42.tar.gz minetest-a6a04c4b5b0cd475ea265b63ff6ff52daf66db42.tar.bz2 minetest-a6a04c4b5b0cd475ea265b63ff6ff52daf66db42.zip | |
Update our tooling (Clang 5 -> 7, GCC 7 -> 8)
This change permits to use up-to-date compilers, clang-tidy and
clang-format
It also refactor the tidy/format step to drop the binary selection from
scripts and perform it directly in travis
Diffstat (limited to 'util/travis/before_install.sh')
| -rwxr-xr-x | util/travis/before_install.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh index 19c40ef90..fef054130 100755 --- a/util/travis/before_install.sh +++ b/util/travis/before_install.sh @@ -4,14 +4,14 @@ echo "Preparing for $TRAVIS_COMMIT_RANGE" . util/travis/common.sh -if [[ "${LINT}" == "1" ]]; then +if [[ ! -z "${CLANG_FORMAT}" ]]; then exit 0 fi needs_compile || exit 0 -if [[ $PLATFORM == "Unix" ]] || [[ $CLANG_TIDY == "1" ]]; then - if [[ $TRAVIS_OS_NAME == "linux" ]] || [[ $CLANG_TIDY == "1" ]]; then +if [[ $PLATFORM == "Unix" ]] || [[ ! -z "${CLANG_TIDY}" ]]; then + if [[ $TRAVIS_OS_NAME == "linux" ]] || [[ ! -z "${CLANG_TIDY}" ]]; then install_linux_deps else install_macosx_deps |