Skip to content

Commit

Permalink
Remove workarounds. (KhronosGroup#67)
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkCallow committed Jan 21, 2019
1 parent 048e006 commit 60bfbce
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ matrix:
- gcc-7
- g++-7
dist: xenial
group: edge
env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
- VULKAN_SDK_VER="1.1.85"
Expand Down Expand Up @@ -49,12 +48,8 @@ install:
- |
case "${TRAVIS_OS_NAME:-linux}" in
linux)
# Import packagecloud.io GPG key. This script also runs apt-get update.
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
sudo apt-get -qq install git-lfs &&
git lfs install &&
git lfs version &&
#sudo apt-get -qq update &&
# No need to install git-lfs. It is part of Travis's Xenial environment.
sudo apt-get -qq update &&
sudo apt-get -qq install doxygen &&
sudo apt-get -qq install libgl1-mesa-glx libgl1-mesa-dev &&
sudo apt-get -qq install libvulkan1 libvulkan-dev &&
Expand Down Expand Up @@ -90,9 +85,6 @@ before_script:
# git-lfs. Therefore we have to pull the files stored in git LFS.
case "${TRAVIS_OS_NAME:-linux}" in
linux)
# The "| cat" avoids a Go panic when LFS can't get the "terminal" width.
# See Git LFS issue https://github.com/github/git-lfs/issues/880.
git lfs pull --include=other_lib/linux | cat
;;
osx)
git lfs pull --include=other_lib/mac,other_lib/ios | cat &&
Expand Down

0 comments on commit 60bfbce

Please sign in to comment.