From d93cfb32fef5b76d4181a8bf7c1e378881483a75 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Fri, 2 Sep 2016 14:49:16 +0100 Subject: [PATCH] travis: Update to XCode 7.3.1 --- .travis-build.sh | 3 ++- .travis-deps.sh | 3 +-- .travis.yml | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis-build.sh b/.travis-build.sh index 8440b4f5ce..80361ddaf9 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -23,11 +23,12 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then elif [ "$TRAVIS_OS_NAME" = "osx" ]; then set -o pipefail + export MACOSX_DEPLOYMENT_TARGET=10.9 export Qt5_DIR=$(brew --prefix)/opt/qt5 mkdir build && cd build cmake .. -GXcode - xcodebuild -configuration Release | xcpretty -c + xcodebuild -configuration Release ctest -VV -C Release fi diff --git a/.travis-deps.sh b/.travis-deps.sh index aad9074bfc..b0833f74ac 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -20,7 +20,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then ) elif [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update > /dev/null # silence the very verbose output - brew unlink cmake + brew unlink cmake || true brew install cmake qt5 sdl2 dylibbundler - gem install xcpretty fi diff --git a/.travis.yml b/.travis.yml index 8be395770d..a693e70aa1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ matrix: dist: trusty - os: osx sudo: false + osx_image: xcode7.3 env: global: