summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.travis-deps.sh17
-rw-r--r--.travis.yml4
2 files changed, 17 insertions, 4 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh
index b0833f74a..567a2543d 100755
--- a/.travis-deps.sh
+++ b/.travis-deps.sh
@@ -9,15 +9,24 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
9 export CXX=g++-6 9 export CXX=g++-6
10 mkdir -p $HOME/.local 10 mkdir -p $HOME/.local
11 11
12 curl -L http://www.cmake.org/files/v3.2/cmake-3.2.0-Linux-i386.tar.gz \ 12 if [ ! -e $HOME/.local/bin/cmake ]; then
13 | tar -xz -C $HOME/.local --strip-components=1 13 echo "CMake not found in the cache, get and extract it..."
14 curl -L http://www.cmake.org/files/v3.2/cmake-3.2.0-Linux-i386.tar.gz \
15 | tar -xz -C $HOME/.local --strip-components=1
16 else
17 echo "Using cached CMake"
18 fi
14 19
15 ( 20 if [ ! -e $HOME/.local/lib/libSDL2.la ]; then
21 echo "SDL2 not found in cache, get and build it..."
16 wget http://libsdl.org/release/SDL2-2.0.4.tar.gz -O - | tar xz 22 wget http://libsdl.org/release/SDL2-2.0.4.tar.gz -O - | tar xz
17 cd SDL2-2.0.4 23 cd SDL2-2.0.4
18 ./configure --prefix=$HOME/.local 24 ./configure --prefix=$HOME/.local
19 make -j4 && make install 25 make -j4 && make install
20 ) 26 else
27 echo "Using cached SDL2"
28 fi
29
21elif [ "$TRAVIS_OS_NAME" = "osx" ]; then 30elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
22 brew update > /dev/null # silence the very verbose output 31 brew update > /dev/null # silence the very verbose output
23 brew unlink cmake || true 32 brew unlink cmake || true
diff --git a/.travis.yml b/.travis.yml
index a693e70aa..69f9ef273 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,10 @@ addons:
26 - lib32stdc++6 # For CMake 26 - lib32stdc++6 # For CMake
27 - lftp # To upload builds 27 - lftp # To upload builds
28 28
29cache:
30 directories:
31 - $HOME/.local
32
29install: ./.travis-deps.sh 33install: ./.travis-deps.sh
30script: ./.travis-build.sh 34script: ./.travis-build.sh
31after_success: ./.travis-upload.sh 35after_success: ./.travis-upload.sh