Merge pull request #212 from citra-emu/master

travis cache for cmake and sdl2 (#2060)
This commit is contained in:
emmauss 2016-09-08 08:50:46 +00:00 committed by GitHub
commit c771c22803
2 changed files with 17 additions and 4 deletions

View File

@ -9,15 +9,24 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
export CXX=g++-6 export CXX=g++-6
mkdir -p $HOME/.local mkdir -p $HOME/.local
if [ ! -e $HOME/.local/bin/cmake ]; then
echo "CMake not found in the cache, get and extract it..."
curl -L http://www.cmake.org/files/v3.2/cmake-3.2.0-Linux-i386.tar.gz \ curl -L http://www.cmake.org/files/v3.2/cmake-3.2.0-Linux-i386.tar.gz \
| tar -xz -C $HOME/.local --strip-components=1 | tar -xz -C $HOME/.local --strip-components=1
else
echo "Using cached CMake"
fi
( if [ ! -e $HOME/.local/lib/libSDL2.la ]; then
echo "SDL2 not found in cache, get and build it..."
wget http://libsdl.org/release/SDL2-2.0.4.tar.gz -O - | tar xz wget http://libsdl.org/release/SDL2-2.0.4.tar.gz -O - | tar xz
cd SDL2-2.0.4 cd SDL2-2.0.4
./configure --prefix=$HOME/.local ./configure --prefix=$HOME/.local
make -j4 && make install make -j4 && make install
) else
echo "Using cached SDL2"
fi
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew update > /dev/null # silence the very verbose output brew update > /dev/null # silence the very verbose output
brew unlink cmake || true brew unlink cmake || true

View File

@ -26,6 +26,10 @@ addons:
- lib32stdc++6 # For CMake - lib32stdc++6 # For CMake
- lftp # To upload builds - lftp # To upload builds
cache:
directories:
- $HOME/.local
install: ./.travis-deps.sh install: ./.travis-deps.sh
script: ./.travis-build.sh script: ./.travis-build.sh
after_success: ./.travis-upload.sh after_success: ./.travis-upload.sh