Skip to content

Commit c191e61

Browse files
authored
remove coverage (TryGhost#1062)
* remove coverage * remove coverage condition
1 parent 33ba84c commit c191e61

File tree

2 files changed

+5
-32
lines changed

2 files changed

+5
-32
lines changed

.travis.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,6 @@ matrix:
6060
apt:
6161
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
6262
packages: [ 'clang-3.5']
63-
- os: linux
64-
compiler: clang
65-
env: NODE_VERSION="5" COVERAGE=true PUBLISHABLE=false
66-
addons:
67-
apt:
68-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
69-
packages: [ 'clang-3.5']
7063
- os: linux
7164
compiler: clang
7265
env: NODE_VERSION="4"
@@ -83,9 +76,6 @@ matrix:
8376
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
8477
packages: [ 'clang-3.5','libsqlite3-dev']
8578
# OS X
86-
- os: osx
87-
compiler: clang
88-
env: NODE_VERSION="5" COVERAGE=true PUBLISHABLE=false # node abi 47
8979
- os: osx
9080
compiler: clang
9181
env: NODE_VERSION="10" # node abi 64
@@ -175,7 +165,6 @@ env:
175165

176166
before_install:
177167
- export PUBLISHABLE=${PUBLISHABLE:-true}
178-
- export COVERAGE=${COVERAGE:-false}
179168
- if [[ $(uname -s) == 'Linux' ]]; then
180169
export CXX="clang++-3.5";
181170
export CC="clang-3.5";
@@ -193,14 +182,6 @@ install:
193182
before_script:
194183
# get commit message
195184
- export COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n')
196-
- if [[ ${COVERAGE} == true ]]; then
197-
if [[ $(uname -s) == 'Linux' ]]; then
198-
curl https://bootstrap.pypa.io/get-pip.py | python - --user;
199-
pip install --user cpp-coveralls;
200-
else
201-
PYTHONUSERBASE=$(pwd)/py-local easy_install --user cpp-coveralls;
202-
fi;
203-
fi
204185

205186
script:
206187
- if [[ "${NODE_VERSION}" ]]; then

scripts/build_against_node.sh

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,11 @@ function publish() {
1313
fi
1414
}
1515

16-
# test installing from source
17-
if [[ ${COVERAGE} == true ]]; then
18-
CXXFLAGS="--coverage" LDFLAGS="--coverage" npm install --build-from-source --clang=1
19-
npm test
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
21-
else
22-
echo "building binaries for publishing"
23-
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
24-
nm lib/binding/*/node_sqlite3.node | grep "GLIBCXX_" | c++filt || true
25-
nm lib/binding/*/node_sqlite3.node | grep "GLIBC_" | c++filt || true
26-
npm test
27-
fi
28-
16+
echo "building binaries for publishing"
17+
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
18+
nm lib/binding/*/node_sqlite3.node | grep "GLIBCXX_" | c++filt || true
19+
nm lib/binding/*/node_sqlite3.node | grep "GLIBC_" | c++filt || true
20+
npm test
2921

3022
publish
3123

0 commit comments

Comments
 (0)