Merge remote-tracking branch 'corristo/osx-ci'

This commit is contained in:
Marc Zinnschlag 2015-02-11 11:42:52 +01:00
commit 33e95c1519
2 changed files with 2 additions and 1 deletions

View file

@ -31,6 +31,7 @@ before_script:
script: script:
- cd ./build - cd ./build
- if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -j4; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -j4; fi
- if [ "$COVERITY_SCAN_BRANCH" != 1 ] && ["${TRAVIS_OS_NAME}" = "osx"]; then make package; fi
after_script: after_script:
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi
notifications: notifications:

View file

@ -6,4 +6,4 @@ export CC=clang
brew tap openmw/openmw brew tap openmw/openmw
brew update brew update
brew unlink boost brew unlink boost
brew install openmw-mygui openmw-bullet openmw-sdl2 openmw-ffmpeg qt unshield brew install openmw-mygui openmw-bullet openmw-sdl2 openmw-ffmpeg openmw/openmw/qt unshield