diff options
| author | DrChat <arkolbed@gmail.com> | 2017-12-20 19:12:34 -0600 |
|---|---|---|
| committer | DrChat <arkolbed@gmail.com> | 2017-12-20 19:12:34 -0600 |
| commit | d51a244909261e7126661e8fa1ad4a93400029d4 (patch) | |
| tree | 470f149841b6fb306b71f78ddcb109b016082d1d | |
| parent | d1eda6c0d47afdcc5b8d25e5a27580b93aa284ac (diff) | |
[Travis] Revert the last few changes; Travis still doesn't have repos for vulkan
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 422ec94fa..93944036c 100644 --- a/.travis.yml +++ b/.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 |