diff options
| -rwxr-xr-x | src/scripts/ci/setup_travis.sh | 26 | ||||
| -rw-r--r-- | src/scripts/ci/travis.yml | 90 |
2 files changed, 58 insertions, 58 deletions
diff --git a/src/scripts/ci/setup_travis.sh b/src/scripts/ci/setup_travis.sh index ddad66c87..50ca2c630 100755 --- a/src/scripts/ci/setup_travis.sh +++ b/src/scripts/ci/setup_travis.sh @@ -11,51 +11,51 @@ set -ev if [ "$TRAVIS_OS_NAME" = "linux" ]; then - if [ "$BUILD_MODE" = "valgrind" ]; then + if [ "$TARGET" = "valgrind" ]; then sudo apt-get -qq update sudo apt-get install valgrind - elif [ "$BUILD_MODE" = "gcc4.8" ]; then + elif [ "$TARGET" = "gcc4.8" ]; then sudo apt-get -qq update sudo apt-get install g++-4.8 - elif [ "$BUILD_MODE" = "cross-i386" ]; then + elif [ "$TARGET" = "cross-i386" ]; then sudo apt-get -qq update sudo apt-get install g++-multilib linux-libc-dev libc6-dev-i386 - elif [ "$BUILD_MODE" = "cross-win64" ]; then + elif [ "$TARGET" = "cross-win64" ]; then sudo apt-get -qq update sudo apt-get install wine g++-mingw-w64-x86-64 - elif [ "$BUILD_MODE" = "cross-arm32" ]; then + elif [ "$TARGET" = "cross-arm32" ]; then sudo apt-get -qq update sudo apt-get install qemu-user g++-arm-linux-gnueabihf - elif [ "$BUILD_MODE" = "cross-arm64" ]; then + elif [ "$TARGET" = "cross-arm64" ]; then sudo apt-get -qq update sudo apt-get install qemu-user g++-aarch64-linux-gnu - elif [ "$BUILD_MODE" = "cross-ppc32" ]; then + elif [ "$TARGET" = "cross-ppc32" ]; then sudo apt-get -qq update sudo apt-get install qemu-user g++-powerpc-linux-gnu - elif [ "$BUILD_MODE" = "cross-ppc64" ]; then + elif [ "$TARGET" = "cross-ppc64" ]; then sudo apt-get -qq update sudo apt-get install qemu-user g++-powerpc64le-linux-gnu - elif [ "$BUILD_MODE" = "cross-mips64" ]; then + elif [ "$TARGET" = "cross-mips64" ]; then sudo apt-get -qq update sudo apt-get install qemu-user g++-mips64-linux-gnuabi64 - elif [ "$BUILD_MODE" = "cross-android-arm32" ] || [ "$BUILD_MODE" = "cross-android-arm64" ]; then + elif [ "$TARGET" = "cross-android-arm32" ] || [ "$TARGET" = "cross-android-arm64" ]; then wget -nv https://dl.google.com/android/repository/"$ANDROID_NDK"-linux-x86_64.zip unzip -qq "$ANDROID_NDK"-linux-x86_64.zip - elif [ "$BUILD_MODE" = "lint" ]; then + elif [ "$TARGET" = "lint" ]; then sudo apt-get -qq update sudo apt-get install pylint - elif [ "$BUILD_MODE" = "coverage" ]; then + elif [ "$TARGET" = "coverage" ]; then # need updated softhsm to avoid https://github.com/opendnssec/SoftHSMv2/issues/239 sudo add-apt-repository -y ppa:pkg-opendnssec/ppa sudo apt-get -qq update @@ -69,7 +69,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then softhsm2-util --init-token --free --label test --pin 123456 --so-pin 12345678 - elif [ "$BUILD_MODE" = "docs" ]; then + elif [ "$TARGET" = "docs" ]; then sudo apt-get -qq update sudo apt-get install doxygen python-docutils diff --git a/src/scripts/ci/travis.yml b/src/scripts/ci/travis.yml index 02cdfded7..341f2982f 100644 --- a/src/scripts/ci/travis.yml +++ b/src/scripts/ci/travis.yml @@ -13,30 +13,30 @@ compiler: env: global: - - CCACHE_MAXSIZE=800M + - CCACHE_MAXSIZE=1G - ANDROID_NDK=android-ndk-r20 matrix: - - BUILD_MODE="shared" - - BUILD_MODE="coverage" - - BUILD_MODE="fuzzers" - - BUILD_MODE="valgrind" - - BUILD_MODE="cross-i386" - - BUILD_MODE="cross-ppc32" - - BUILD_MODE="cross-ppc64" - - BUILD_MODE="cross-arm32" - - BUILD_MODE="cross-arm64" - - BUILD_MODE="cross-mips64" - - BUILD_MODE="cross-win64" - - BUILD_MODE="cross-android-arm32" - - BUILD_MODE="cross-android-arm64" - - BUILD_MODE="gcc4.8" - - BUILD_MODE="static" - - BUILD_MODE="mini-shared" - - BUILD_MODE="bsi" - - BUILD_MODE="nist" - - BUILD_MODE="docs" - - BUILD_MODE="lint" + - TARGET="shared" + - TARGET="coverage" + - TARGET="fuzzers" + - TARGET="valgrind" + - TARGET="cross-i386" + - TARGET="cross-ppc32" + - TARGET="cross-ppc64" + - TARGET="cross-arm32" + - TARGET="cross-arm64" + - TARGET="cross-mips64" + - TARGET="cross-win64" + - TARGET="cross-android-arm32" + - TARGET="cross-android-arm64" + - TARGET="gcc4.8" + - TARGET="static" + - TARGET="mini-shared" + - TARGET="bsi" + - TARGET="nist" + - TARGET="docs" + - TARGET="lint" matrix: exclude: @@ -46,7 +46,7 @@ matrix: # XCode 9.4 ICEs on 32-bit ARM builds - os: osx - env: BUILD_MODE="cross-arm32" + env: TARGET="cross-arm32" # Run static, docs, lint, bsi, nist, fuzzers, coverage, valgrind, # sanitizer, minimized and non-ARM cross builds only on Linux/gcc. @@ -54,62 +54,62 @@ matrix: # cause CI timeouts. - compiler: clang - env: BUILD_MODE="static" + env: TARGET="static" - compiler: clang - env: BUILD_MODE="bsi" + env: TARGET="bsi" - compiler: clang - env: BUILD_MODE="nist" + env: TARGET="nist" - compiler: clang - env: BUILD_MODE="lint" + env: TARGET="lint" - compiler: clang - env: BUILD_MODE="docs" + env: TARGET="docs" - compiler: clang - env: BUILD_MODE="coverage" + env: TARGET="coverage" - compiler: clang - env: BUILD_MODE="fuzzers" + env: TARGET="fuzzers" - compiler: clang - env: BUILD_MODE="valgrind" + env: TARGET="valgrind" - compiler: clang - env: BUILD_MODE="mini-shared" + env: TARGET="mini-shared" - compiler: clang - env: BUILD_MODE="cross-win64" + env: TARGET="cross-win64" - compiler: clang - env: BUILD_MODE="cross-ppc32" + env: TARGET="cross-ppc32" - compiler: clang - env: BUILD_MODE="cross-ppc64" + env: TARGET="cross-ppc64" - compiler: clang - env: BUILD_MODE="cross-mips64" + env: TARGET="cross-mips64" - compiler: clang - env: BUILD_MODE="cross-i386" + env: TARGET="cross-i386" - compiler: clang - env: BUILD_MODE="gcc4.8" + env: TARGET="gcc4.8" # No ARM Clang compiler on Linux - os: linux compiler: clang - env: BUILD_MODE="cross-arm32" + env: TARGET="cross-arm32" - os: linux compiler: clang - env: BUILD_MODE="cross-arm64" + env: TARGET="cross-arm64" - # Android NDK is Linux only + # Android NDK is Linux/clang only - os: osx - env: BUILD_MODE="cross-android-arm32" + env: TARGET="cross-android-arm32" - os: osx - env: BUILD_MODE="cross-android-arm64" + env: TARGET="cross-android-arm64" - os: linux compiler: gcc - env: BUILD_MODE="cross-android-arm32" + env: TARGET="cross-android-arm32" - os: linux compiler: gcc - env: BUILD_MODE="cross-android-arm64" + env: TARGET="cross-android-arm64" install: - ./src/scripts/ci/setup_travis.sh script: - - ./src/scripts/ci_build.py --os=$TRAVIS_OS_NAME --cc=$CC --cc-bin=$CXX --without-pylint3 --pkcs11-lib=/usr/lib/softhsm/libsofthsm2.so $BUILD_MODE + - ./src/scripts/ci_build.py --os=$TRAVIS_OS_NAME --cc=$CC --cc-bin=$CXX --without-pylint3 --pkcs11-lib=/usr/lib/softhsm/libsofthsm2.so $TARGET # whitelist branches to avoid testing feature branches twice (as branch and as pull request) branches: |