ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 9f895c3f14 89218371a2
commit 3beb9093ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.travis.yml
View File

@ -9,16 +9,16 @@ os:
# - osx # - osx
sudo: required sudo: required
dist: trusty dist: xenial
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty-4.0 - llvm-toolchain-xenial-6.0
packages: packages:
- clang-4.0 - clang-6.0
- llvm-4.0-dev - llvm-6.0-dev
- g++-5 - g++-8
- python3 - python3
- libc++-dev - libc++-dev
- libc++abi-dev - libc++abi-dev
@ -32,10 +32,10 @@ addons:
matrix: matrix:
include: 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 sudo: false
- env: C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 BUILD=true CONFIG=Debug - env: C_COMPILER=clang-6.0 CXX_COMPILER=clang++-6.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=Release
git: git:
# We handle submodules ourselves in xenia-build setup. # We handle submodules ourselves in xenia-build setup.
@ -72,3 +72,4 @@ script:
#- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=false #- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=false
# All tests (with haswell support). # All tests (with haswell support).
#- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=true #- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=true