Skip to content

Commit 114a5e7

Browse files
author
Dane Springmeyer
committed
restore matrix
1 parent 4187d2c commit 114a5e7

2 files changed

Lines changed: 81 additions & 2 deletions

File tree

‎.travis.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,89 @@ branches:
2222

2323
matrix:
2424
include:
25+
# Linux
26+
- os: linux
27+
compiler: clang
28+
env: NODE_VERSION="5"
29+
addons:
30+
apt:
31+
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
32+
packages: [ 'clang-3.5']
33+
- os: linux
34+
compiler: clang
35+
env: NODE_VERSION="4"
36+
addons:
37+
apt:
38+
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
39+
packages: [ 'clang-3.5']
40+
- os: linux
41+
compiler: clang
42+
env: NODE_VERSION="iojs-3.1.0"
43+
addons:
44+
apt:
45+
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
46+
packages: [ 'clang-3.5']
47+
- os: linux
48+
compiler: clang
49+
env: NODE_VERSION="iojs-2.4.0"
50+
addons:
51+
apt:
52+
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
53+
packages: [ 'clang-3.5']
54+
- os: linux
55+
compiler: clang
56+
env: NODE_VERSION="iojs-1.8.4"
57+
addons:
58+
apt:
59+
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
60+
packages: [ 'clang-3.5']
61+
- os: linux
62+
compiler: clang
63+
env: NODE_VERSION="0.12.7"
64+
addons:
65+
apt:
66+
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
67+
packages: [ 'clang-3.5']
68+
- os: linux
69+
compiler: clang
70+
env: NODE_VERSION="0.10.40"
71+
addons:
72+
apt:
73+
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
74+
packages: [ 'clang-3.5']
75+
# test building against external sqlite
76+
- os: linux
77+
compiler: clang
78+
env: NODE_VERSION="0.10.40" EXTERNAL_SQLITE=true PUBLISHABLE=false
79+
addons:
80+
apt:
81+
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
82+
packages: [ 'clang-3.5','libsqlite3-dev']
2583
# OS X
2684
- os: osx
2785
compiler: clang
2886
env: NODE_VERSION="5" COVERAGE=true PUBLISHABLE=false # node abi 47
87+
- os: osx
88+
compiler: clang
89+
env: NODE_VERSION="5" # node abi 47
90+
- os: osx
91+
compiler: clang
92+
env: NODE_VERSION="4" # node abi 46
93+
- os: osx
94+
compiler: clang
95+
env: NODE_VERSION="iojs-3.1.0" # node abi 46
96+
- os: osx
97+
compiler: clang
98+
env: NODE_VERSION="iojs-2.4.0" # node abi 44
99+
- os: osx
100+
compiler: clang
101+
env: NODE_VERSION="iojs-1.8.4" # node abi 43
102+
- os: osx
103+
compiler: clang
104+
env: NODE_VERSION="0.12.7" # node abi 14
105+
- os: osx
106+
compiler: clang
107+
env: NODE_VERSION="0.10.40" # node abi 11
29108

30109
env:
31110
global:

‎scripts/build_against_node.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ function publish() {
1515

1616
# test installing from source
1717
if [[ ${COVERAGE} == true ]]; then
18-
CXXFLAGS="--coverage" LDFLAGS="--coverage" npm install --build-from-source --clang=1 --verbose
18+
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
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
2121
else
2222
npm install --build-from-source --clang=1
2323
npm test

0 commit comments

Comments
 (0)