wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

upgrade OSX image on travis

This commit is contained in:
arvidn 2017-12-31 15:20:15 +01:00 committed by Arvid Norberg
parent 493cbf12b9
commit f6e5005db1
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.travis.yml
View File

@ -11,13 +11,13 @@ matrix:
- env: variant=test_release coverage=1 tests=1 toolset=gcc-coverage python=1 - env: variant=test_release coverage=1 tests=1 toolset=gcc-coverage python=1
- env: autotools=1 toolset=gcc - env: autotools=1 toolset=gcc
- os: osx - os: osx
osx_image: xcode7.3 osx_image: xcode9.2
env: variant=test_release docs=1 tests=1 toolset=darwin env: variant=test_release docs=1 tests=1 toolset=darwin
- os: osx - os: osx
osx_image: xcode7.3 osx_image: xcode9.2
env: variant=test_debug crypto=openssl tests=1 toolset=darwin env: variant=test_debug crypto=openssl tests=1 toolset=darwin
- os: osx - os: osx
osx_image: xcode7.3 osx_image: xcode9.2
env: variant=test_barebones tools=1 examples=1 toolset=darwin python=1 env: variant=test_barebones tools=1 examples=1 toolset=darwin python=1
- env: arch=arm toolset=gcc-arm - env: arch=arm toolset=gcc-arm
@ -61,7 +61,10 @@ before_install:
- 'if [[ $TRAVIS_OS_NAME == "osx" && ( "$tests" == "1" || "$sim" == 1 || "$examples" == "1" || "$tools" == "1" || "$python" == "1" ) ]]; then - 'if [[ $TRAVIS_OS_NAME == "osx" && ( "$tests" == "1" || "$sim" == 1 || "$examples" == "1" || "$tools" == "1" || "$python" == "1" ) ]]; then
travis_retry brew update > /dev/null && brew install ccache boost-build; travis_retry brew update > /dev/null && brew install ccache boost-build;
fi' fi'
- 'if [[ $TRAVIS_OS_NAME == "osx" && "$python" == "1" ]]; then travis_retry brew install boost-python; fi' # we have to use python from brew rather than the system provided python
# because of OSX System Integrity Protection, which prevents injecting
# user-libraries (i.e. python modules) into system binaries (i.e. /usr/bin/python)
- 'if [[ $TRAVIS_OS_NAME == "osx" && "$python" == "1" ]]; then travis_retry brew install boost-python python2; fi'
- 'if [ "$docs" = "1" ]; then - 'if [ "$docs" = "1" ]; then
easy_install --user docutils; easy_install --user docutils;
mkdir -p /Users/travis/Library/Python/2.7/lib/python/site-packages; mkdir -p /Users/travis/Library/Python/2.7/lib/python/site-packages;
@ -148,6 +151,8 @@ install:
cd ..; cd ..;
fi' fi'
- which python2
script: script:
- cd docs - cd docs
@ -188,10 +193,15 @@ script:
- cd .. - cd ..
# a binary built with sanitizer does not interact well with python # a binary built with sanitizer does not interact well with python
# on OSX we need to use the brew version of python, for reasons explained above
- cd bindings/python - cd bindings/python
- 'if [[ "$python" == "1" ]]; then - 'if [[ "$python" == "1" ]]; then
bjam -j3 warnings-as-errors=on crypto=$crypto debug-iterators=on picker-debugging=on asserts=on invariant-checks=full $toolset variant=$variant stage_module stage_dependencies libtorrent-link=shared boost-link=shared && bjam -j3 warnings-as-errors=on crypto=$crypto debug-iterators=on picker-debugging=on asserts=on invariant-checks=full $toolset variant=$variant stage_module stage_dependencies libtorrent-link=shared boost-link=shared &&
LD_LIBRARY_PATH=./dependencies DYLD_LIBRARY_PATH=./dependencies python test.py; if [[ $TRAVIS_OS_NAME == "osx" ]]; then
DYLD_LIBRARY_PATH=./dependencies python2 test.py;
else
LD_LIBRARY_PATH=./dependencies python test.py;
fi;
fi' fi'
- cd ../..; - cd ../..;