diff options
| author | gumi <git@gumi.ca> | 2018-03-04 23:06:40 -0500 |
|---|---|---|
| committer | gumi <git@gumi.ca> | 2018-03-04 23:06:40 -0500 |
| commit | d80ea0cf1e56817402079bcce4929506c83453ab (patch) | |
| tree | 9bb9781a3e0299557e75ad4dd1dceff8c9141c10 | |
| parent | f6b126e2a438dc72e086d291c82981deb4db018b (diff) | |
| download | tmwa-d80ea0cf1e56817402079bcce4929506c83453ab.tar.gz tmwa-d80ea0cf1e56817402079bcce4929506c83453ab.tar.bz2 tmwa-d80ea0cf1e56817402079bcce4929506c83453ab.tar.xz tmwa-d80ea0cf1e56817402079bcce4929506c83453ab.zip | |
remove old crust from travis matrix
| -rw-r--r-- | .travis.yml | 106 |
1 files changed, 27 insertions, 79 deletions
diff --git a/.travis.yml b/.travis.yml index 26bef5c..9537d8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ notifications: ## Use the container-based infrastructure sudo: false +dist: trusty ## Commands before installing before_install: @@ -44,95 +45,28 @@ matrix: fast-finish: true include: - compiler: clang - env: REAL_CC=clang-3.5 REAL_CXX=clang++-3.5 + env: REAL_CC=clang-4.0 REAL_CXX=clang++-4.0 addons: apt: sources: - - llvm-toolchain-precise-3.5 - # needed for libstdc++ headers + - llvm-toolchain-trusty-4.0 - ubuntu-toolchain-r-test packages: - - clang-3.5 - - libstdc++6-4.6-dbg - - libgtest-dev - - valgrind - - gdb - - compiler: clang - env: REAL_CC=clang-3.6 REAL_CXX=clang++-3.6 - addons: - apt: - sources: - - llvm-toolchain-precise-3.6 - # needed for libstdc++ headers - - ubuntu-toolchain-r-test - packages: - - clang-3.6 - - libstdc++6-4.6-dbg - - libgtest-dev - - valgrind - - gdb - - compiler: clang - env: REAL_CC=clang-3.7 REAL_CXX=clang++-3.7 - addons: - apt: - sources: - - llvm-toolchain-precise-3.7 - # needed for libstdc++ headers - - ubuntu-toolchain-r-test - packages: - - clang-3.7 - - libstdc++6-4.6-dbg - - libgtest-dev - - valgrind - - gdb - # Can't use valgrind and asan at the same time. - # Should probably fix the test leaks though. - - compiler: gcc - env: REAL_CC=gcc-5 REAL_CXX=g++-5 REAL_EXTRA=-fsanitize=address FORCE_TESTER='' ASAN_OPTIONS=detect_leaks=0 LDFLAGS="-fuse-ld=gold" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-5 + - clang-4.0 - libstdc++6-5-dbg - libgtest-dev - # - valgrind - - gdb - allow_failures: - - compiler: gcc - env: REAL_CC=gcc-4.7 REAL_CXX=g++-4.7 LDFLAGS="-fuse-ld=gold" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.7 - - libstdc++6-4.7-dbg - - libgtest-dev - - valgrind - - gdb - - compiler: gcc - env: REAL_CC=gcc-4.8 REAL_CXX=g++-4.8 LDFLAGS="-fuse-ld=gold" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - libstdc++6-4.8-dbg - - libgtest-dev - valgrind - gdb - - compiler: gcc - env: REAL_CC=gcc-4.9 REAL_CXX=g++-4.9 LDFLAGS="-fuse-ld=gold" + - compiler: clang + env: REAL_CC=clang-5.0 REAL_CXX=clang++-5.0 addons: apt: sources: + - llvm-toolchain-trusty-5.0 - ubuntu-toolchain-r-test packages: - - g++-4.9 - - libstdc++6-4.9-dbg + - clang-5.0 + - libstdc++6-6-dbg - libgtest-dev - valgrind - gdb @@ -148,19 +82,33 @@ matrix: - libgtest-dev - valgrind - gdb - # LTO is buggy. - compiler: gcc - env: REAL_CC=gcc-5 REAL_CXX=g++-5 REAL_EXTRA=-flto LDFLAGS="-fuse-ld=gold" + env: REAL_CC=gcc-6 REAL_CXX=g++-6 LDFLAGS="-fuse-ld=gold" addons: apt: sources: - ubuntu-toolchain-r-test packages: - - g++-5 - - libstdc++6-5-dbg + - g++-6 + - libstdc++6-6-dbg - libgtest-dev - valgrind - gdb + # Can't use valgrind and asan at the same time. + # Should probably fix the test leaks though. + # Nevermind: we can't use asan without sudo anymore: travis no longer allows disabling ASLR + #- compiler: gcc + # env: REAL_CC=gcc-5 REAL_CXX=g++-5 REAL_EXTRA=-fsanitize=address FORCE_TESTER='' ASAN_OPTIONS=detect_leaks=0 LDFLAGS="-fuse-ld=gold" + # addons: + # apt: + # sources: + # - ubuntu-toolchain-r-test + # packages: + # - g++-5 + # - libstdc++6-5-dbg + # - libgtest-dev + # # - valgrind + # - gdb # everything that was pushed to stable was already on 'master', except # the version change and some doc changes. |