asfgit closed pull request #428: DISPATCH-1115: make TravisCI job use a Proton release in addition to master URL: https://github.com/apache/qpid-dispatch/pull/428
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/.travis.yml b/.travis.yml index fc6b8445..43164bd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,9 @@ dist: trusty sudo: true language: c cache: ccache +env: + - PROTON_VERSION=master BUILD_TYPE=Coverage + - PROTON_VERSION=0.26.0 BUILD_TYPE=RelWithDebInfo addons: apt: @@ -47,8 +50,7 @@ addons: install: - PREFIX=$PWD/install -- git submodule add https://gitbox.apache.org/repos/asf/qpid-proton.git -- git submodule update --init +- git clone --depth=10 --branch=$PROTON_VERSION https://github.com/apache/qpid-proton.git # Build and install latest proton from source. - mkdir qpid-proton/build @@ -63,18 +65,17 @@ before_script: - source qpid-proton/build/config.sh - mkdir build - pushd build -- cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DUSE_VALGRIND=NO -DCMAKE_BUILD_TYPE=Coverage +- cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DUSE_VALGRIND=NO -DCMAKE_BUILD_TYPE=${BUILD_TYPE} - cmake --build . --target install script: - pushd ../qpid-proton -- echo $(echo "Current proton checkout:") $(git rev-parse HEAD) +- echo $(echo "Current proton commit:") $(git rev-parse HEAD) "(${PROTON_VERSION})" - popd -- ctest -V && cmake --build . --target coverage +- ctest -V && if [ "$BUILD_TYPE" = "Coverage" ]; then cmake --build . --target coverage; fi - popd - mvn apache-rat:check after_success: - pushd build -- bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports" - +- if [ "$BUILD_TYPE" = "Coverage" ]; then bash <(curl -s https://codecov.io/bash); fi ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org For additional commands, e-mail: dev-h...@qpid.apache.org
