Skip to content

Commit 534bc4b

Browse files
committed
travis fix coverage & pip
1 parent 8381059 commit 534bc4b

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ matrix:
5353
apt:
5454
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
5555
packages: [ 'clang-3.5']
56+
- os: linux
57+
compiler: clang
58+
env: NODE_VERSION="5" COVERAGE=true PUBLISHABLE=false
59+
addons:
60+
apt:
61+
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
62+
packages: [ 'clang-3.5']
5663
- os: linux
5764
compiler: clang
5865
env: NODE_VERSION="4"
@@ -69,9 +76,6 @@ matrix:
6976
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
7077
packages: [ 'clang-3.5','libsqlite3-dev']
7178
# OS X
72-
- os: osx
73-
compiler: clang
74-
env: NODE_VERSION="5" COVERAGE=true PUBLISHABLE=false # node abi 47
7579
- os: osx
7680
compiler: clang
7781
env: NODE_VERSION="9" # node abi 58
@@ -148,7 +152,8 @@ before_script:
148152
- export COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n')
149153
- if [[ ${COVERAGE} == true ]]; then
150154
if [[ $(uname -s) == 'Linux' ]]; then
151-
PYTHONUSERBASE=$(pwd)/py-local pip install --user cpp-coveralls;
155+
curl https://bootstrap.pypa.io/get-pip.py | python - --user;
156+
pip install --user cpp-coveralls;
152157
else
153158
PYTHONUSERBASE=$(pwd)/py-local easy_install --user cpp-coveralls;
154159
fi;

scripts/build_against_node.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function publish() {
1717
if [[ ${COVERAGE} == true ]]; then
1818
CXXFLAGS="--coverage" LDFLAGS="--coverage" npm install --build-from-source --clang=1
1919
npm test
20-
./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
20+
cpp-coveralls --exclude node_modules --exclude tests --build-root build --gcov-options '\-lp' --exclude docs --exclude build/Release/obj/gen --exclude deps > /dev/null
2121
else
2222
echo "building binaries for publishing"
2323
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

0 commit comments

Comments
 (0)