qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject [17/31] qpid-proton git commit: NO-JIRA: Change Travis build to use "matrix" builds for coverage - Note don't actually need to run "make coverage" as codecov.io does all that processing itself.
Date Wed, 15 Nov 2017 21:05:41 GMT
NO-JIRA: Change Travis build to use "matrix" builds for coverage
- Note don't actually need to run "make coverage" as codecov.io
  does all that processing itself.


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/7781204e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/7781204e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/7781204e

Branch: refs/heads/go1
Commit: 7781204e58b238c40faf8a35c3206d2634ce161d
Parents: 0790bb9
Author: Andrew Stitcher <astitcher@apache.org>
Authored: Thu Oct 26 16:00:06 2017 -0400
Committer: Andrew Stitcher <astitcher@apache.org>
Committed: Thu Oct 26 17:39:06 2017 -0400

----------------------------------------------------------------------
 .travis.yml            | 15 ++++++++-------
 bin/record-coverage.sh |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7781204e/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f8694b0..f162dcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,13 @@ language: cpp
 compiler:
 - gcc
 - clang
-
+env:
+- QPID_PROTON_CMAKE_ARGS=
+- QPID_PROTON_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Coverage
+matrix:
+  exclude:
+  - compiler: clang
+    env: QPID_PROTON_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Coverage
 addons:
   apt:
     packages:
@@ -56,11 +62,6 @@ script:
 
 after_success:
 - |
-    if [[ ${CC} = gcc ]]; then
-      mkdir ../build_coverage
-      cd ../build_coverage
-      cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/install -DCMAKE_BUILD_TYPE=Coverage ${QPID_PROTON_CMAKE_ARGS}
-      cmake --build . --target install && ctest -V ${QPID_PROTON_CTEST_ARGS}
-      make coverage
+    if [[ -d coverage_results ]]; then
       bash <(curl -s https://codecov.io/bash)
     fi

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7781204e/bin/record-coverage.sh
----------------------------------------------------------------------
diff --git a/bin/record-coverage.sh b/bin/record-coverage.sh
index edc903d..f161e6d 100755
--- a/bin/record-coverage.sh
+++ b/bin/record-coverage.sh
@@ -1,4 +1,4 @@
-# /usr/bin/bash
+#! /usr/bin/env bash
 
 # This script collates coverage data already present from running instrumented code.
 #


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message