summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2015-01-11 00:19:10 -0500
committerGravatar bunnei2015-01-11 00:19:10 -0500
commit463d0a373be11b6c117bfb0cc71418dfd5272679 (patch)
treea691345b945823463d784f3e331a031e0508b27e
parentMerge pull request #458 from yuriks/cmake-debug (diff)
parentRevert "Travis: Enable caching of dependencies" (diff)
downloadyuzu-463d0a373be11b6c117bfb0cc71418dfd5272679.tar.gz
yuzu-463d0a373be11b6c117bfb0cc71418dfd5272679.tar.xz
yuzu-463d0a373be11b6c117bfb0cc71418dfd5272679.zip
Merge pull request #460 from chinhodado/revert-319-travis-apt-cache
Revert "Travis: Enable caching of dependencies"
-rw-r--r--.travis-deps.sh2
-rw-r--r--.travis.yml5
2 files changed, 0 insertions, 7 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh
index 2a0f6b284..bd09da0d0 100644
--- a/.travis-deps.sh
+++ b/.travis-deps.sh
@@ -24,8 +24,6 @@ if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then
24 curl http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \ 24 curl http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \
25 | sudo tar -xz -C /usr/local --strip-components=1 25 | sudo tar -xz -C /usr/local --strip-components=1
26elif [ "$TRAVIS_OS_NAME" = osx ]; then 26elif [ "$TRAVIS_OS_NAME" = osx ]; then
27 export HOMEBREW_CACHE="$PWD/.homebrew-cache"
28 mkdir -p "$HOMEBREW_CACHE"
29 brew tap homebrew/versions 27 brew tap homebrew/versions
30 brew install qt5 glfw3 pkgconfig 28 brew install qt5 glfw3 pkgconfig
31fi 29fi
diff --git a/.travis.yml b/.travis.yml
index 8c5aceb7c..1cb369d5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,6 @@ os:
4 4
5language: cpp 5language: cpp
6 6
7cache:
8 apt: true
9 directories:
10 - .homebrew-cache
11
12before_install: 7before_install:
13 - sh .travis-deps.sh 8 - sh .travis-deps.sh
14 9