diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2016-10-05 22:17:22 +0200 |
|---|---|---|
| committer | Ner'zhul <nerzhul@users.noreply.github.com> | 2016-10-06 00:28:24 +0200 |
| commit | 61d1751dfff71d8fd433c6c84bd39db1672a3ee6 (patch) | |
| tree | ead3afdfcc79b05f2cd18b16782fa8e68a8a8d81 /.travis.yml | |
| parent | 7fab86a49dd569f24804eb7396843e61095e3854 (diff) | |
| download | minetest-61d1751dfff71d8fd433c6c84bd39db1672a3ee6.tar.gz minetest-61d1751dfff71d8fd433c6c84bd39db1672a3ee6.tar.bz2 minetest-61d1751dfff71d8fd433c6c84bd39db1672a3ee6.zip | |
Travis: build matrix improvements + CPP11 build
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index 9d1600818..534479efb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,4 @@ language: cpp -compiler: - - gcc - - clang -os: - - osx - - linux -env: - - PLATFORM=Win32 - - PLATFORM=Win64 - - PLATFORM=Unix before_install: ./util/travis/before_install.sh script: ./util/travis/script.sh sudo: required @@ -16,14 +6,26 @@ notifications: email: false matrix: fast_finish: true - exclude: + include: - env: PLATFORM=Win32 - compiler: clang + compiler: gcc + os: linux - env: PLATFORM=Win64 + compiler: gcc + os: linux + - env: PLATFORM=Unix COMPILER=clang compiler: clang - - env: PLATFORM=Win32 - os: osx - - env: PLATFORM=Win64 - os: osx - - compiler: gcc os: osx + - env: PLATFORM=Unix COMPILER=g++ + compiler: gcc + os: linux + - env: PLATFORM=Unix COMPILER=clang + compiler: clang + os: linux + - env: PLATFORM=Unix COMPILER=g++-6 + compiler: gcc + os: linux +addons: + apt: + sources: &sources + - ubuntu-toolchain-r-test |