diff options
| author | Simon Warta <[email protected]> | 2015-12-09 13:55:07 +0100 |
|---|---|---|
| committer | Simon Warta <[email protected]> | 2015-12-09 14:12:11 +0100 |
| commit | fa835579f8024dbf54ef6759dceecd1ff244f69a (patch) | |
| tree | ab6f55cffd4bd2631f7199ad93c67bbbc77d16fe /src/scripts/ci | |
| parent | 6186714288fceb5afc2c48df6c97a7eb46c6e28e (diff) | |
Add boost builds on Travis OSX
Diffstat (limited to 'src/scripts/ci')
| -rwxr-xr-x | src/scripts/ci/travis/build.sh | 6 | ||||
| -rwxr-xr-x | src/scripts/ci/travis/install.sh | 10 | ||||
| -rwxr-xr-x | src/scripts/ci/travis/install_osx_packages.sh | 10 |
3 files changed, 14 insertions, 12 deletions
diff --git a/src/scripts/ci/travis/build.sh b/src/scripts/ci/travis/build.sh index 06d3bfb04..50fc3164f 100755 --- a/src/scripts/ci/travis/build.sh +++ b/src/scripts/ci/travis/build.sh @@ -16,6 +16,10 @@ if [ "$MODULES" = "min" ]; then CFG_FLAGS+=(--minimized-build --enable-modules=base) fi +if [ "$BOOST" = "y" ]; then + CFG_FLAGS+=(--with-boost) +fi + # Workaround for missing update-alternatives # https://github.com/travis-ci/travis-ci/issues/3668 if [ "$CXX" = "g++" ]; then @@ -59,7 +63,7 @@ if [ "$MODULES" != "min" ] && [ "${TARGETOS:0:3}" != "ios" ]; then ./botan-test fi -if [ "$MODULES" != "min" ] && [ "$BUILD_MODE" = "shared" ] && [ "$TARGETOS" = "desktop" ] +if [ "$MODULES" != "min" ] && [ "$BUILD_MODE" = "shared" ] && [ "$TARGETOS" = "native" ] then python2 --version python3 --version diff --git a/src/scripts/ci/travis/install.sh b/src/scripts/ci/travis/install.sh index 830834d3e..67dd82cfe 100755 --- a/src/scripts/ci/travis/install.sh +++ b/src/scripts/ci/travis/install.sh @@ -12,5 +12,13 @@ if [ "$BUILD_MODE" = "coverage" ]; then fi if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$TARGETOS" != "ios" ]; then - ./src/scripts/ci/travis/install_osx_packages.sh + # Workaround for https://github.com/Homebrew/homebrew/issues/42553 + brew update || brew update + + brew install xz + brew install python # python2 + brew install python3 + + # Boost 1.58 is installed on Travis OS X images + # brew install boost fi diff --git a/src/scripts/ci/travis/install_osx_packages.sh b/src/scripts/ci/travis/install_osx_packages.sh deleted file mode 100755 index 588855cc0..000000000 --- a/src/scripts/ci/travis/install_osx_packages.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -ev -which shellcheck > /dev/null && shellcheck "$0" # Run shellcheck on this if available - -# Workaround for https://github.com/Homebrew/homebrew/issues/42553 -brew update || brew update - -brew install xz -brew install python # python2 -brew install python3 |