Unverified Commit 534bc4b0 by Kewde

travis fix coverage & pip

parent 83810592
...@@ -55,6 +55,13 @@ matrix: ...@@ -55,6 +55,13 @@ matrix:
packages: [ 'clang-3.5'] packages: [ 'clang-3.5']
- os: linux - os: linux
compiler: clang compiler: clang
env: NODE_VERSION="5" COVERAGE=true PUBLISHABLE=false
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
packages: [ 'clang-3.5']
- os: linux
compiler: clang
env: NODE_VERSION="4" env: NODE_VERSION="4"
addons: addons:
apt: apt:
...@@ -71,9 +78,6 @@ matrix: ...@@ -71,9 +78,6 @@ matrix:
# OS X # OS X
- os: osx - os: osx
compiler: clang compiler: clang
env: NODE_VERSION="5" COVERAGE=true PUBLISHABLE=false # node abi 47
- os: osx
compiler: clang
env: NODE_VERSION="9" # node abi 58 env: NODE_VERSION="9" # node abi 58
- os: osx - os: osx
compiler: clang compiler: clang
...@@ -148,7 +152,8 @@ before_script: ...@@ -148,7 +152,8 @@ before_script:
- export COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n') - export COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n')
- if [[ ${COVERAGE} == true ]]; then - if [[ ${COVERAGE} == true ]]; then
if [[ $(uname -s) == 'Linux' ]]; then if [[ $(uname -s) == 'Linux' ]]; then
PYTHONUSERBASE=$(pwd)/py-local pip install --user cpp-coveralls; curl https://bootstrap.pypa.io/get-pip.py | python - --user;
pip install --user cpp-coveralls;
else else
PYTHONUSERBASE=$(pwd)/py-local easy_install --user cpp-coveralls; PYTHONUSERBASE=$(pwd)/py-local easy_install --user cpp-coveralls;
fi; fi;
......
...@@ -17,7 +17,7 @@ function publish() { ...@@ -17,7 +17,7 @@ function publish() {
if [[ ${COVERAGE} == true ]]; then if [[ ${COVERAGE} == true ]]; then
CXXFLAGS="--coverage" LDFLAGS="--coverage" npm install --build-from-source --clang=1 CXXFLAGS="--coverage" LDFLAGS="--coverage" npm install --build-from-source --clang=1
npm test npm test
./py-local/bin/cpp-coveralls --exclude node_modules --exclude tests --build-root build --gcov-options '\-lp' --exclude docs --exclude build/Release/obj/gen --exclude deps > /dev/null cpp-coveralls --exclude node_modules --exclude tests --build-root build --gcov-options '\-lp' --exclude docs --exclude build/Release/obj/gen --exclude deps > /dev/null
else else
echo "building binaries for publishing" echo "building binaries for publishing"
CFLAGS="${CFLAGS:-} -include $(pwd)/src/gcc-preinclude.h" CXXFLAGS="${CXXFLAGS:-} -include $(pwd)/src/gcc-preinclude.h" V=1 npm install --build-from-source --clang=1 CFLAGS="${CFLAGS:-} -include $(pwd)/src/gcc-preinclude.h" CXXFLAGS="${CXXFLAGS:-} -include $(pwd)/src/gcc-preinclude.h" V=1 npm install --build-from-source --clang=1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment