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

[Travis] Revert the last few changes; Travis still doesn't have repos for vulkan

This commit is contained in:
DrChat 2017-12-20 19:12:34 -06:00
parent d1eda6c0d4
commit d51a244909
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -8,14 +8,13 @@ os:
- linux - linux
# - osx # - osx
sudo: false sudo: required
dist: trusty dist: trusty
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty-4.0 - llvm-toolchain-trusty-4.0
- debian-sid
packages: packages:
- clang-4.0 - clang-4.0
- llvm-4.0-dev - llvm-4.0-dev
@ -26,8 +25,8 @@ addons:
- libglew-dev - libglew-dev
- libgtk-3-dev - libgtk-3-dev
- libpthread-stubs0-dev - libpthread-stubs0-dev
- libvulkan1 #- libvulkan1
- libvulkan-dev #- libvulkan-dev
- libx11-dev - libx11-dev
- liblz4-dev - liblz4-dev
@ -47,6 +46,10 @@ before_script:
# Dump useful info. # Dump useful info.
- $CXX --version - $CXX --version
- python3 --version - python3 --version
# Add Vulkan dependencies
- travis_retry wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb
- travis_retry wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb
- sudo dpkg -i libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb
# Prepare environment (pull dependencies, build tools). # Prepare environment (pull dependencies, build tools).
- travis_retry ./xenia-build setup - travis_retry ./xenia-build setup