You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2018/12/21 10:56:03 UTC
[qpid-dispatch] branch master updated: DISPATCH-1115: have TravisCI
build+test against Proton master and a Proton release.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new 181d97b DISPATCH-1115: have TravisCI build+test against Proton master and a Proton release.
181d97b is described below
commit 181d97b6879e67b1c4b3117e8710e01bd7ee06bf
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Dec 21 10:37:04 2018 +0000
DISPATCH-1115: have TravisCI build+test against Proton master and a Proton release.
- Does a coverage build/test+collection for proton master, regular build/test for proton release.
This closes #428
---
.travis.yml | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index fc6b844..43164bd 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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org