Repository: parquet-cpp
Updated Branches:
  refs/heads/master 25cda53f6 -> f8401b15a


PARQUET-1075: Fix broken Coverage upload

The same problem is seen in another project below. Used the same fix.
https://github.com/micropython/micropython/issues/3246

Author: Deepak Majeti <deepak.maj...@hpe.com>

Closes #382 from majetideepak/PARQUET-1075 and squashes the following commits:

0aa5123 [Deepak Majeti] PARQUET-1075:C++: Coverage upload is broken fix flag 
for static linking fix coveralls


Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/f8401b15
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/f8401b15
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/f8401b15

Branch: refs/heads/master
Commit: f8401b15ab83823470a0c404364be73270398d83
Parents: 25cda53
Author: Deepak Majeti <deepak.maj...@hpe.com>
Authored: Thu Aug 10 13:53:36 2017 -0400
Committer: Wes McKinney <wes.mckin...@twosigma.com>
Committed: Thu Aug 10 13:53:36 2017 -0400

----------------------------------------------------------------------
 ci/travis_script_cpp.sh    | 7 ++++---
 ci/travis_script_static.sh | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/f8401b15/ci/travis_script_cpp.sh
----------------------------------------------------------------------
diff --git a/ci/travis_script_cpp.sh b/ci/travis_script_cpp.sh
index 888b088..78d7d86 100755
--- a/ci/travis_script_cpp.sh
+++ b/ci/travis_script_cpp.sh
@@ -33,9 +33,10 @@ make lint
 if [ $TRAVIS_OS_NAME == "linux" ]; then
   make -j4 || exit 1
   ctest -VV -L unittest || { cat 
$TRAVIS_BUILD_DIR/parquet-build/Testing/Temporary/LastTest.log; exit 1; }
-  # sudo pip install cpp_coveralls
-  # export PARQUET_ROOT=$TRAVIS_BUILD_DIR
-  # $TRAVIS_BUILD_DIR/ci/upload_coverage.sh
+# Current cpp-coveralls version 0.4 throws an error (PARQUET-1075) on Travis 
CI. Pin to last working version
+  sudo pip install cpp_coveralls==0.3.12
+  export PARQUET_ROOT=$TRAVIS_BUILD_DIR
+  $TRAVIS_BUILD_DIR/ci/upload_coverage.sh
 else
   make -j4 || exit 1
   BUILD_TYPE=debug

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/f8401b15/ci/travis_script_static.sh
----------------------------------------------------------------------
diff --git a/ci/travis_script_static.sh b/ci/travis_script_static.sh
index 4af2653..29331e9 100755
--- a/ci/travis_script_static.sh
+++ b/ci/travis_script_static.sh
@@ -63,7 +63,7 @@ export BROTLI_STATIC_LIB_DEC=$BROTLI_EP/libbrotlidec.a
 export BROTLI_STATIC_LIB_COMMON=$BROTLI_EP/libbrotlicommon.a
 export ZLIB_STATIC_LIB=$ARROW_EP/zlib_ep/src/zlib_ep-install/lib/libz.a
 
-cmake -DPARQUET_CXXFLAGS=-Werror \
+cmake -DPARQUET_CXXFLAGS="$PARQUET_CXXFLAGS" \
       -DPARQUET_TEST_MEMCHECK=ON \
       -DPARQUET_ARROW_LINKAGE="static" \
       -DPARQUET_BUILD_SHARED=OFF \

Reply via email to