diff options
| author | bunnei <bunneidev@gmail.com> | 2016-09-02 19:56:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-02 19:56:29 -0400 |
| commit | fed59e07148bbfa5517570bdfdcafde535b0da71 (patch) | |
| tree | 52bfac78b6c21ffc3c021e5fb2704b3ffc533e30 | |
| parent | 274b925a9705ebd5c4ec242c70d44249dc9f2b0d (diff) | |
| parent | d93cfb32fef5b76d4181a8bf7c1e378881483a75 (diff) | |
Merge pull request #2045 from MerryMage/travis
travis: Update to XCode 7.3.1
| -rwxr-xr-x | .travis-build.sh | 3 | ||||
| -rwxr-xr-x | .travis-deps.sh | 3 | ||||
| -rw-r--r-- | .travis.yml | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.travis-build.sh b/.travis-build.sh index 8440b4f5c..80361ddaf 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 aad9074bf..b0833f74a 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 8be395770..a693e70aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ matrix: dist: trusty - os: osx sudo: false + osx_image: xcode7.3 env: global: |