Merge pull request #2045 from MerryMage/travis
travis: Update to XCode 7.3.1
This commit is contained in:
commit
fed59e0714
|
@ -23,11 +23,12 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
|
||||||
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
|
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
|
export MACOSX_DEPLOYMENT_TARGET=10.9
|
||||||
export Qt5_DIR=$(brew --prefix)/opt/qt5
|
export Qt5_DIR=$(brew --prefix)/opt/qt5
|
||||||
|
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake .. -GXcode
|
cmake .. -GXcode
|
||||||
xcodebuild -configuration Release | xcpretty -c
|
xcodebuild -configuration Release
|
||||||
|
|
||||||
ctest -VV -C Release
|
ctest -VV -C Release
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -20,7 +20,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
|
||||||
)
|
)
|
||||||
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
|
brew unlink cmake || true
|
||||||
brew install cmake qt5 sdl2 dylibbundler
|
brew install cmake qt5 sdl2 dylibbundler
|
||||||
gem install xcpretty
|
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -7,6 +7,7 @@ matrix:
|
||||||
dist: trusty
|
dist: trusty
|
||||||
- os: osx
|
- os: osx
|
||||||
sudo: false
|
sudo: false
|
||||||
|
osx_image: xcode7.3
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
|
|
Reference in New Issue