summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2014-12-20 23:21:08 -0500
committerGravatar bunnei2014-12-20 23:21:08 -0500
commit09a5df31d6e292af2d239f4f5f86251f8c7a21ea (patch)
treec5825541e19a39bfbfbefc50684001093f261f38
parentMerge pull request #316 from yuriks/thread-handle (diff)
parentTravis: Try to cache downloaded files to work around sf.net sucking (diff)
downloadyuzu-09a5df31d6e292af2d239f4f5f86251f8c7a21ea.tar.gz
yuzu-09a5df31d6e292af2d239f4f5f86251f8c7a21ea.tar.xz
yuzu-09a5df31d6e292af2d239f4f5f86251f8c7a21ea.zip
Merge pull request #319 from yuriks/travis-apt-cache
Travis: Enable caching of dependencies
-rw-r--r--.travis-deps.sh2
-rw-r--r--.travis.yml5
2 files changed, 7 insertions, 0 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh
index 8e22a6358..b978e552e 100644
--- a/.travis-deps.sh
+++ b/.travis-deps.sh
@@ -20,6 +20,8 @@ if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then
20 curl http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \ 20 curl http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \
21 | sudo tar -xz -C /usr/local --strip-components=1 21 | sudo tar -xz -C /usr/local --strip-components=1
22elif [ "$TRAVIS_OS_NAME" = osx ]; then 22elif [ "$TRAVIS_OS_NAME" = osx ]; then
23 export HOMEBREW_CACHE="$PWD/.homebrew-cache"
24 mkdir -p "$HOMEBREW_CACHE"
23 brew tap homebrew/versions 25 brew tap homebrew/versions
24 brew install qt5 glfw3 pkgconfig 26 brew install qt5 glfw3 pkgconfig
25fi 27fi
diff --git a/.travis.yml b/.travis.yml
index 1cb369d5b..8c5aceb7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,11 @@ os:
4 4
5language: cpp 5language: cpp
6 6
7cache:
8 apt: true
9 directories:
10 - .homebrew-cache
11
7before_install: 12before_install:
8 - sh .travis-deps.sh 13 - sh .travis-deps.sh
9 14