diff options
| author | Rick Gibbed <rick@gibbed.us> | 2018-11-22 09:08:26 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-22 09:08:26 -0600 |
| commit | 3beb9093ac630ce4c143f3fa63479d9f51526478 (patch) | |
| tree | d8b6645dbe8ff51a825d0bbb79730e3b1e00b7f4 | |
| parent | 9f895c3f14e7420cbbf354168f5ae48488ab1060 (diff) | |
| parent | 89218371a2b916dfecb5914fec91dd789f03a36e (diff) | |
Merge pull request #1279 from chris-hawley/master
[Travis] Update Travis to use Xenial and more recent compilers
| -rw-r--r-- | .travis.yml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 87823fa70..55d848556 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,16 +9,16 @@ os: # - osx sudo: required -dist: trusty +dist: xenial addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-4.0 + - llvm-toolchain-xenial-6.0 packages: - - clang-4.0 - - llvm-4.0-dev - - g++-5 + - clang-6.0 + - llvm-6.0-dev + - g++-8 - python3 - libc++-dev - libc++abi-dev @@ -32,10 +32,10 @@ addons: matrix: include: - - env: C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 LINT=true + - env: C_COMPILER=clang-6.0 CXX_COMPILER=clang++-6.0 LINT=true sudo: false - - env: C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 BUILD=true CONFIG=Debug - - env: C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 BUILD=true CONFIG=Release + - env: C_COMPILER=clang-6.0 CXX_COMPILER=clang++-6.0 BUILD=true CONFIG=Debug + - env: C_COMPILER=clang-6.0 CXX_COMPILER=clang++-6.0 BUILD=true CONFIG=Release git: # We handle submodules ourselves in xenia-build setup. @@ -72,3 +72,4 @@ script: #- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=false # All tests (with haswell support). #- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=true + |