diff --git a/src/secp256k1/.travis.yml b/src/secp256k1/.travis.yml index ffa061b4d..402e52aa4 100644 --- a/src/secp256k1/.travis.yml +++ b/src/secp256k1/.travis.yml @@ -1,67 +1,88 @@ language: c os: linux +dist: xenial addons: apt: + sources: + - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main' + key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc' packages: + - cmake - libgmp-dev - ninja-build compiler: - clang - gcc env: global: - FIELD=auto BIGNUM=auto SCALAR=auto ENDOMORPHISM=no STATICPRECOMPUTATION=yes ASM=no BUILD=check EXTRAFLAGS= HOST= ECDH=no RECOVERY=no SCHNORR=yes EXPERIMENTAL=no JNI=no jobs: - SCALAR=32bit RECOVERY=yes - SCALAR=32bit FIELD=32bit ECDH=yes EXPERIMENTAL=yes - SCALAR=64bit - FIELD=64bit RECOVERY=yes - FIELD=64bit ENDOMORPHISM=yes - FIELD=64bit ENDOMORPHISM=yes ECDH=yes EXPERIMENTAL=yes - FIELD=64bit ASM=x86_64 - FIELD=64bit ENDOMORPHISM=yes ASM=x86_64 - FIELD=32bit ENDOMORPHISM=yes - BIGNUM=no - BIGNUM=no ENDOMORPHISM=yes RECOVERY=yes EXPERIMENTAL=yes - BIGNUM=no STATICPRECOMPUTATION=no - BUILD=distcheck - EXTRAFLAGS=CPPFLAGS=-DDETERMINISTIC - EXTRAFLAGS=CFLAGS=-O0 - BUILD=check-java JNI=yes ECDH=yes EXPERIMENTAL=yes - SCHNORR=no jobs: fast_finish: true include: - compiler: clang env: HOST=i686-linux-gnu ENDOMORPHISM=yes addons: apt: + sources: + - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main' + key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc' packages: + - cmake - gcc-multilib - libgmp-dev:i386 - ninja-build:i386 - compiler: clang env: HOST=i686-linux-gnu addons: apt: + sources: + - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main' + key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc' packages: + - cmake - gcc-multilib - ninja-build:i386 - compiler: gcc env: HOST=i686-linux-gnu ENDOMORPHISM=yes addons: apt: + sources: + - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main' + key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc' packages: + - cmake - gcc-multilib - ninja-build:i386 - compiler: gcc env: HOST=i686-linux-gnu addons: apt: + sources: + - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main' + key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc' packages: + - cmake - gcc-multilib - libgmp-dev:i386 - ninja-build:i386 script: - ./travis/build_autotools.sh - ./travis/build_cmake.sh diff --git a/src/secp256k1/travis/build_cmake.sh b/src/secp256k1/travis/build_cmake.sh index 62baea283..f1db61046 100755 --- a/src/secp256k1/travis/build_cmake.sh +++ b/src/secp256k1/travis/build_cmake.sh @@ -1,30 +1,34 @@ #!/usr/bin/env bash export LC_ALL=C set -ex if [ "x$HOST" = "xi686-linux-gnu" ]; then TOOLCHAIN_FILE="-DCMAKE_TOOLCHAIN_FILE=../cmake/platforms/Linux32.cmake" fi if [ "x$BIGNUM" = "xno" ]; then USE_GMP="-DGMP_LIBRARY=OFF" fi mkdir -p buildcmake pushd buildcmake -cmake -GNinja .. \ +# Use the cmake version installed via APT instead of the Travis custom one. +CMAKE_COMMAND=/usr/bin/cmake +${CMAKE_COMMAND} --version + +${CMAKE_COMMAND} -GNinja .. \ -DSECP256K1_ECMULT_STATIC_PRECOMPUTATION=$STATICPRECOMPUTATION \ -DSECP256K1_ENABLE_MODULE_ECDH=$ECDH \ -DSECP256K1_ENABLE_MODULE_RECOVERY=$RECOVERY \ -DSECP256K1_ENABLE_MODULE_SCHNORR=$SCHNORR \ -DSECP256K1_ENABLE_JNI=$JNI \ -DUSE_ASM_X86_64=$ASM \ $USE_GMP \ $TOOLCHAIN_FILE \ ninja check-secp256k1 popd