CCF_100
/
citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2045 from MerryMage/travis 

travis: Update to XCode 7.3.1
master
bunnei 2016-09-02 19:56:29 +07:00 committed by GitHub
parent 274b925a97 d93cfb32fe
commit fed59e0714
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis-build.sh
Unescape Escape View File

@ -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

3
.travis-deps.sh
Unescape Escape View File

@ -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

1
.travis.yml
Unescape Escape View File

@ -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: