[Travis] Revert the last few changes; Travis still doesn't have repos for vulkan
This commit is contained in:
parent
d1eda6c0d4
commit
d51a244909
11
.travis.yml
11
.travis.yml
|
@ -8,14 +8,13 @@ os:
|
|||
- linux
|
||||
# - osx
|
||||
|
||||
sudo: false
|
||||
sudo: required
|
||||
dist: trusty
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-trusty-4.0
|
||||
- debian-sid
|
||||
packages:
|
||||
- clang-4.0
|
||||
- llvm-4.0-dev
|
||||
|
@ -26,8 +25,8 @@ addons:
|
|||
- libglew-dev
|
||||
- libgtk-3-dev
|
||||
- libpthread-stubs0-dev
|
||||
- libvulkan1
|
||||
- libvulkan-dev
|
||||
#- libvulkan1
|
||||
#- libvulkan-dev
|
||||
- libx11-dev
|
||||
- liblz4-dev
|
||||
|
||||
|
@ -47,6 +46,10 @@ before_script:
|
|||
# Dump useful info.
|
||||
- $CXX --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).
|
||||
- travis_retry ./xenia-build setup
|
||||
|
||||
|
|
Loading…
Reference in New Issue