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 /.travis.yml | |
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 '.travis.yml')
-rw-r--r-- | .travis.yml | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index 2409a51cd..23f6d5ebb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,24 +10,26 @@ matrix: fast_finish: true include: - - env: LINT=1 + - env: CLANG_FORMAT=clang-format-7 compiler: clang os: linux addons: apt: - packages: ['clang-format-5.0'] + packages: ['clang-format-7'] sources: &sources - - llvm-toolchain-trusty-5.0 + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-7 - - env: CLANG_TIDY=1 + - env: CLANG_TIDY=clang-tidy-7 compiler: clang os: linux script: ./util/travis/clangtidy.sh addons: apt: - packages: ['clang-tidy-5.0'] + packages: ['clang-7', 'clang++-7', 'clang-tools-7', 'clang-tidy-7'] sources: &sources - - llvm-toolchain-trusty-5.0 + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-7 - env: PLATFORM=Win32 compiler: gcc @@ -63,12 +65,12 @@ matrix: sources: &sources - ubuntu-toolchain-r-test - - env: PLATFORM=Unix COMPILER=gcc-7 + - env: PLATFORM=Unix COMPILER=gcc-8 compiler: gcc os: linux addons: apt: - packages: ['gcc-7', 'g++-7'] + packages: ['gcc-8', 'g++-8'] sources: &sources - ubuntu-toolchain-r-test @@ -81,29 +83,33 @@ matrix: sources: &sources - llvm-toolchain-trusty-3.6 - - env: PLATFORM=Unix COMPILER=clang-5.0 + - env: PLATFORM=Unix COMPILER=clang-7 compiler: clang os: linux addons: apt: - packages: ['clang-5.0', 'clang++-5.0'] + packages: ['clang-7', 'clang++-7'] sources: &sources - - llvm-toolchain-trusty-5.0 + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-7 - - env: PLATFORM=Unix COMPILER=clang-5.0 FREETYPE=0 + - env: PLATFORM=Unix COMPILER=clang-7 FREETYPE=0 compiler: clang os: linux addons: apt: - packages: ['clang-5.0', 'clang++-5.0'] + packages: ['clang-7', 'clang++-7'] sources: &sources - - llvm-toolchain-trusty-5.0 + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-7 - - env: PLATFORM=Unix COMPILER=clang-5.0 VALGRIND=1 + - env: PLATFORM=Unix COMPILER=clang-7 VALGRIND=1 compiler: clang os: linux addons: apt: - packages: ['valgrind', 'clang-5.0', 'clang++-5.0'] + packages: ['valgrind', 'clang-7', 'clang++-7'] sources: &sources - - llvm-toolchain-trusty-5.0 + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-7 + |