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/common.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/common.sh')
| -rw-r--r-- | util/travis/common.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/util/travis/common.sh b/util/travis/common.sh index 949540967..b4406866e 100644 --- a/util/travis/common.sh +++ b/util/travis/common.sh @@ -7,15 +7,15 @@ set_linux_compiler_env() { elif [[ "${COMPILER}" == "gcc-6" ]]; then export CC=gcc-6 export CXX=g++-6 - elif [[ "${COMPILER}" == "gcc-7" ]]; then - export CC=gcc-7 - export CXX=g++-7 + elif [[ "${COMPILER}" == "gcc-8" ]]; then + export CC=gcc-8 + export CXX=g++-8 elif [[ "${COMPILER}" == "clang-3.6" ]]; then export CC=clang-3.6 export CXX=clang++-3.6 - elif [[ "${COMPILER}" == "clang-5.0" ]]; then - export CC=clang-5.0 - export CXX=clang++-5.0 + elif [[ "${COMPILER}" == "clang-7" ]]; then + export CC=clang-7 + export CXX=clang++-7 fi } |