diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2017-05-26 17:03:46 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-04 09:57:08 +0200 |
| commit | bf6569b57019d070246d947ed929cb2b5eb67faf (patch) | |
| tree | 3a8a3d4858f20a57930e0a0d0ad1f7c3fb48b512 /.travis.yml | |
| parent | 0e58168fe5bce607f64805b854420e7558372f24 (diff) | |
| download | minetest-bf6569b57019d070246d947ed929cb2b5eb67faf.tar.gz minetest-bf6569b57019d070246d947ed929cb2b5eb67faf.tar.bz2 minetest-bf6569b57019d070246d947ed929cb2b5eb67faf.zip | |
Minetest for C++11 (CMakeLists + Travis)
* Move GCC to GCC 6 & GCC 7
* Move Clang to Clang 3.6 & Clang 4.0
* LINT moves from Clang 3.9 to Clang 4.0
* Move XCode 7.3 to 8.0
* Use more travis tricks to install compilers instead of adding complexity to our build script
* Clang format fixes on checked files (compat Cpp11 instead of Cpp03)
* Mingw GCC update from 4.8.4 to 5.3 (Ubuntu Xenial)
* Drop mingw cmake generated files and add them to gitignore
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 78 |
1 files changed, 65 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 57d934c90..123705fe6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: cpp before_install: ./util/travis/before_install.sh script: ./util/travis/script.sh sudo: required +dist: trusty notifications: email: false matrix: @@ -10,30 +11,81 @@ matrix: - env: PLATFORM=Win32 compiler: gcc os: linux + addons: + apt: + packages: ['gcc-mingw-w64-i686', 'g++-mingw-w64-i686', 'binutils-mingw-w64-i686'] + sources: &sources + - ubuntu-toolchain-r-test + - sourceline: 'deb http://mirrors.kernel.org/ubuntu xenial main universe' + - env: PLATFORM=Win64 compiler: gcc os: linux - - env: PLATFORM=Unix COMPILER=clang + addons: + apt: + packages: ['gcc-mingw-w64-x86-64', 'g++-mingw-w64-x86-64', 'binutils-mingw-w64-x86-64'] + sources: &sources + - ubuntu-toolchain-r-test + - sourceline: 'deb http://mirrors.kernel.org/ubuntu xenial main universe' + + - env: PLATFORM=Unix compiler: clang os: osx - - env: PLATFORM=Unix COMPILER=g++ + osx_image: xcode8 + + - env: PLATFORM=Unix COMPILER=gcc-6 compiler: gcc os: linux - - env: PLATFORM=Unix COMPILER=clang + addons: + apt: + packages: ['gcc-6', 'g++-6'] + sources: &sources + - ubuntu-toolchain-r-test + + - env: PLATFORM=Unix COMPILER=gcc-7 + compiler: gcc + os: linux + addons: + apt: + packages: ['gcc-7', 'g++-7'] + sources: &sources + - ubuntu-toolchain-r-test + + - env: PLATFORM=Unix COMPILER=clang-3.6 compiler: clang os: linux - - env: PLATFORM=Unix COMPILER=clang VALGRIND=1 + addons: + apt: + packages: ['clang-3.6', 'clang++-3.6'] + sources: &sources + - llvm-toolchain-trusty-3.6 + + - env: PLATFORM=Unix COMPILER=clang-4.0 compiler: clang os: linux - dist: trusty - - env: COMPILER=none LINT=1 + addons: + apt: + packages: ['clang-4.0', 'clang++-4.0'] + sources: &sources + - llvm-toolchain-trusty-4.0 + + - env: PLATFORM=Unix COMPILER=clang-4.0 VALGRIND=1 compiler: clang os: linux - dist: trusty - - env: PLATFORM=Unix COMPILER=g++-6 - compiler: gcc + addons: + apt: + packages: ['valgrind', 'clang-4.0', 'clang++-4.0'] + sources: &sources + - llvm-toolchain-trusty-4.0 + + - env: LINT=1 + compiler: clang os: linux -addons: - apt: - sources: &sources - - ubuntu-toolchain-r-test + addons: + apt: + packages: ['clang-format-4.0'] + sources: &sources + - llvm-toolchain-trusty-4.0 + + + |