diff --git a/.travis.yml b/.travis.yml index 300e1b0..a060e04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,13 +17,12 @@ addons: env: matrix: -# - ZMQ_BUILD_TYPE=cmake DRAFT=enabled - - ZMQ_BUILD_TYPE=cmake ZMQ_VERSION=4.2.5 - - ZMQ_BUILD_TYPE=pkgconf ZMQ_VERSION=4.2.0 + - ZMQ_VERSION=4.2.5 + - ZMQ_VERSION=4.2.4 matrix: include: - # - env: ZMQ_BUILD_TYPE=cmake DO_CLANG_FORMAT_CHECK=1 CLANG_FORMAT=/usr/local/clang-5.0.0/bin/clang-format + # - env: BUILD_TYPE=cmake DO_CLANG_FORMAT_CHECK=1 CLANG_FORMAT=/usr/local/clang-5.0.0/bin/clang-format # os: linux # addons: # apt: @@ -39,14 +38,14 @@ matrix: packages: - g++-7 env: - - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" ZMQ_BUILD_TYPE=cmake ZMQ_VERSION=4.2.5 DRAFT=1 + - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" ZMQ_VERSION=4.2.5 DRAFT=1 sudo: required before_install: - pip install --user cpp-coveralls -# Build and check this project according to the ZMQ_BUILD_TYPE +# Build and check this project script: - eval "${MATRIX_EVAL}" - ./ci_build.sh diff --git a/ci_build.sh b/ci_build.sh index a383bf2..891fd1a 100755 --- a/ci_build.sh +++ b/ci_build.sh @@ -3,6 +3,9 @@ set -x set -e +LIBZMQ=${PWD}/libzmq-build +CPPZMQ=${PWD}/cppzmq-build + if [ "$DRAFT" = "1" ] ; then # if we enable drafts during the libzmq cmake build, the pkgconfig # data should set ZMQ_BUILD_DRAFT_API in dependent builds, but this @@ -10,29 +13,15 @@ if [ "$DRAFT" = "1" ] ; then export ZEROMQ_CMAKE_FLAGS="-DENABLE_DRAFTS=ON" fi -LIBZMQ=${PWD}/libzmq-build -CPPZMQ=${PWD}/cppzmq-build install_zeromq() { curl -L https://github.com/zeromq/libzmq/archive/v${ZMQ_VERSION}.tar.gz \ >zeromq.tar.gz tar -xvzf zeromq.tar.gz - if [ "${ZMQ_BUILD_TYPE}" = "cmake" ] ; then - cmake -Hlibzmq-${ZMQ_VERSION} -B${LIBZMQ} -DWITH_PERF_TOOL=OFF \ - -DZMQ_BUILD_TESTS=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - ${ZEROMQ_CMAKE_FLAGS} - cmake --build ${LIBZMQ} - elif [ "${ZMQ_BUILD_TYPE}" = "pkgconf" ] ; then - pushd . - cd libzmq-${ZMQ_VERSION} - ./autogen.sh - ./configure - sudo make VERBOSE=1 -j5 install - popd - else - echo "Unsupported build type ${ZMQ_BUILD_TYPE}." - exit 1 - fi + cmake -Hlibzmq-${ZMQ_VERSION} -B${LIBZMQ} -DWITH_PERF_TOOL=OFF \ + -DZMQ_BUILD_TESTS=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + ${ZEROMQ_CMAKE_FLAGS} + cmake --build ${LIBZMQ} } # build zeromq first @@ -40,7 +29,6 @@ install_zeromq() { if [ "${ZMQ_VERSION}" != "" ] ; then install_zeromq ; fi # build cppzmq -# for pkgconf ZMQ_BUILD_TYPE ZeroMQ_DIR is invalid but it should still work pushd . ZeroMQ_DIR=${LIBZMQ} cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS} cmake --build ${CPPZMQ}