diff options
| -rw-r--r-- | .travis.yml | 61 | ||||
| -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 |
4 files changed, 61 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml index b4f11be7d..352d736e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,33 +26,66 @@ compiler: env: matrix: - - TARGETOS="desktop" MODULES="all" BUILD_MODE="shared" - - TARGETOS="desktop" MODULES="all" BUILD_MODE="static" - - TARGETOS="desktop" MODULES="all" BUILD_MODE="coverage" - - TARGETOS="desktop" MODULES="all" BUILD_MODE="sanitizer" + - TARGETOS="native" MODULES="all" BOOST="n" BUILD_MODE="shared" + - TARGETOS="native" MODULES="all" BOOST="n" BUILD_MODE="static" + - TARGETOS="native" MODULES="all" BOOST="n" BUILD_MODE="coverage" + - TARGETOS="native" MODULES="all" BOOST="n" BUILD_MODE="sanitizer" + - TARGETOS="native" MODULES="all" BOOST="y" BUILD_MODE="shared" + - TARGETOS="native" MODULES="all" BOOST="y" BUILD_MODE="static" + - TARGETOS="native" MODULES="all" BOOST="y" BUILD_MODE="coverage" + - TARGETOS="native" MODULES="all" BOOST="y" BUILD_MODE="sanitizer" - - TARGETOS="desktop" MODULES="min" BUILD_MODE="shared" - - TARGETOS="desktop" MODULES="min" BUILD_MODE="static" + - TARGETOS="native" MODULES="min" BOOST="n" BUILD_MODE="shared" + - TARGETOS="native" MODULES="min" BOOST="n" BUILD_MODE="static" + - TARGETOS="native" MODULES="min" BOOST="y" BUILD_MODE="shared" + - TARGETOS="native" MODULES="min" BOOST="y" BUILD_MODE="static" - - TARGETOS="ios32" MODULES="all" BUILD_MODE="static" - - TARGETOS="ios64" MODULES="all" BUILD_MODE="static" + - TARGETOS="ios32" MODULES="all" BOOST="n" BUILD_MODE="static" + - TARGETOS="ios64" MODULES="all" BOOST="n" BUILD_MODE="static" matrix: exclude: - os: osx compiler: gcc + + # No boost on Linux because installing Boost is easier on OS X + - os: linux + env: TARGETOS="native" MODULES="all" BOOST="y" BUILD_MODE="shared" + - os: linux + env: TARGETOS="native" MODULES="all" BOOST="y" BUILD_MODE="static" + - os: linux + env: TARGETOS="native" MODULES="all" BOOST="y" BUILD_MODE="coverage" + - os: linux + env: TARGETOS="native" MODULES="all" BOOST="y" BUILD_MODE="sanitizer" + - os: linux + env: TARGETOS="native" MODULES="min" BOOST="y" BUILD_MODE="shared" + - os: linux + env: TARGETOS="native" MODULES="min" BOOST="y" BUILD_MODE="static" + + # No coverage and sanitizer on clang + - compiler: clang + env: TARGETOS="native" MODULES="all" BOOST="n" BUILD_MODE="coverage" - compiler: clang - env: TARGETOS="desktop" MODULES="all" BUILD_MODE="coverage" + env: TARGETOS="native" MODULES="all" BOOST="n" BUILD_MODE="sanitizer" - compiler: clang - env: TARGETOS="desktop" MODULES="all" BUILD_MODE="sanitizer" + env: TARGETOS="native" MODULES="all" BOOST="y" BUILD_MODE="coverage" + - compiler: clang + env: TARGETOS="native" MODULES="all" BOOST="y" BUILD_MODE="sanitizer" + + # No minimal builds on clang - compiler: clang - env: TARGETOS="desktop" MODULES="min" BUILD_MODE="shared" + env: TARGETOS="native" MODULES="min" BOOST="n" BUILD_MODE="shared" - compiler: clang - env: TARGETOS="desktop" MODULES="min" BUILD_MODE="static" + env: TARGETOS="native" MODULES="min" BOOST="n" BUILD_MODE="static" + - compiler: clang + env: TARGETOS="native" MODULES="min" BOOST="y" BUILD_MODE="shared" + - compiler: clang + env: TARGETOS="native" MODULES="min" BOOST="y" BUILD_MODE="static" + - os: linux - env: TARGETOS="ios32" MODULES="all" BUILD_MODE="static" + env: TARGETOS="ios32" MODULES="all" BOOST="n" BUILD_MODE="static" - os: linux - env: TARGETOS="ios64" MODULES="all" BUILD_MODE="static" + env: TARGETOS="ios64" MODULES="all" BOOST="n" BUILD_MODE="static" # END BUILD MATRIX cache: 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 |