From d78d3750801fbcaa4592b63665ba5985ab3ef891 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Sat, 15 Oct 2016 05:54:01 +0200 Subject: [PATCH] travis: Install ccache on macOS builds --- .travis.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.travis.sh b/.travis.sh index 43e0478fee..8fca2617a4 100644 --- a/.travis.sh +++ b/.travis.sh @@ -18,12 +18,20 @@ download_extract_zip() { unzip $2 2>&1 | pv > /dev/null } +brew_install() { + brew install $1 + brew outdated $1 || brew upgrade $1 +} + travis_before_install() { git submodule update --init --recursive - if [ ! "$TRAVIS_OS_NAME" = "osx" ]; then + if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq sudo apt-get install software-properties-common aria2 pv build-essential libgl1-mesa-dev libglu1-mesa-dev -qq + elif [ "$TRAVIS_OS_NAME" = "osx" ]; then + brew update + brew_install ccache fi } @@ -72,8 +80,7 @@ travis_install() { fi if [ "$PPSSPP_BUILD_TYPE" = "macOS" ]; then - brew update - brew install sdl2 + brew_install sdl2 fi # Ensure we're using ccache