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

[Travis] Move all addons back into the same section :|

This commit is contained in:
DrChat 2017-12-19 22:01:27 -06:00
parent dccbff3db3
commit 4f7bfe8816
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@ -13,8 +13,10 @@ addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty - llvm-toolchain-trusty-4.0
packages: packages:
- clang-4.0
- g++-5
- python3 - python3
- libc++-dev - libc++-dev
- libc++abi-dev - libc++abi-dev
@ -27,23 +29,11 @@ addons:
matrix: matrix:
include: include:
- env: C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 LINT=true - env: C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 LINT=true
addons: &clang40
apt:
packages:
- clang-4.0
- g++-5
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-4.0
- 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=Debug
addons: *clang40
- env: C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 BUILD=true CONFIG=Release - env: C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 BUILD=true CONFIG=Release
addons: *clang40
allow_failures: allow_failures:
# LLVMGold.so is not installed correctly # LLVMGold.so is not installed correctly
- env: C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 BUILD=true CONFIG=Release - env: C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 BUILD=true CONFIG=Release
addons: *clang40
git: git:
# We handle submodules ourselves in xenia-build setup. # We handle submodules ourselves in xenia-build setup.