Merge pull request #1279 from chris-hawley/master

[Travis] Update Travis to use Xenial and more recent compilers
This commit is contained in:
Rick Gibbed 2018-11-22 09:08:26 -06:00 committed by GitHub
commit 3beb9093ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions

View File

@ -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