Skip to content

Commit df723d5

Browse files
Matheus MarchiniMatheus Marchini
authored andcommitted
travis: increase versions and OS coverage
* Reworked travis.yaml to use matrix settings, giving us more control over each job settings. * Remove v4.x, since it's not a supported release line anymore * Add jobs v10.x * Add jobs for Mac OS X * Add jobs for Node.js master and v8-canary builds. Those jobs are ignored in the build final result. * Add a build status table to the README Ref: #187
1 parent 7f1e791 commit df723d5

File tree

4 files changed

+107
-16
lines changed

4 files changed

+107
-16
lines changed

.travis.yml

Lines changed: 78 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,82 @@
11
language: node_js
2-
sudo: required
3-
dist: trusty
4-
before_install:
5-
- sudo apt-get -qq update
6-
- sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
7-
node_js:
8-
- "4"
9-
- "6"
10-
- "8"
11-
- "9"
2+
matrix:
3+
include:
4+
# Test on Ubuntu Trusty
5+
- sudo: required
6+
dist: trusty
7+
before_install:
8+
- sudo apt-get -qq update
9+
- sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
10+
node_js: "6"
11+
- sudo: required
12+
dist: trusty
13+
before_install:
14+
- sudo apt-get -qq update
15+
- sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
16+
node_js: "8"
17+
- sudo: required
18+
dist: trusty
19+
before_install:
20+
- sudo apt-get -qq update
21+
- sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
22+
node_js: "9"
23+
- sudo: required
24+
dist: trusty
25+
before_install:
26+
- sudo apt-get -qq update
27+
- sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
28+
node_js: "10"
29+
# Test Node.js master nightly build
30+
- node_js: "node"
31+
sudo: required
32+
dist: trusty
33+
before_install:
34+
- sudo apt-get -qq update
35+
- sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
36+
install:
37+
- npm install --nodedir=$(dirname $(dirname $(which node)))/include/node
38+
env:
39+
- NVM_NODEJS_ORG_MIRROR=https://nodejs.org/download/nightly
40+
- NODEJS_ORG_MIRROR=https://nodejs.org/download/nightly
41+
# Test Node.js v8-canary nightly build
42+
- node_js: "node"
43+
sudo: required
44+
dist: trusty
45+
before_install:
46+
- sudo apt-get -qq update
47+
- sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
48+
install:
49+
- npm install --nodedir=$(dirname $(dirname $(which node)))/include/node
50+
env:
51+
- NVM_NODEJS_ORG_MIRROR=https://nodejs.org/download/v8-canary
52+
- NODEJS_ORG_MIRROR=https://nodejs.org/download/v8-canary
53+
# Test on OS X
54+
- os: osx
55+
osx_image: xcode9.3
56+
node_js: "6"
57+
- os: osx
58+
osx_image: xcode9.3
59+
node_js: "8"
60+
- os: osx
61+
osx_image: xcode9.3
62+
node_js: "9"
63+
- os: osx
64+
osx_image: xcode9.3
65+
node_js: "10"
66+
allow_failures:
67+
# Allow the nightly installs to fail
68+
- node_js: "node"
69+
sudo: required
70+
dist: trusty
71+
env:
72+
- NVM_NODEJS_ORG_MIRROR=https://nodejs.org/download/nightly
73+
- NODEJS_ORG_MIRROR=https://nodejs.org/download/nightly
74+
- node_js: "node"
75+
sudo: required
76+
dist: trusty
77+
env:
78+
- NVM_NODEJS_ORG_MIRROR=https://nodejs.org/download/v8-canary
79+
- NODEJS_ORG_MIRROR=https://nodejs.org/download/v8-canary
1280
branches:
1381
only:
1482
- master

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ plugin: configure
4040
.PHONY: _travis
4141
_travis:
4242
TEST_LLDB_BINARY="$(TEST_LLDB_BINARY)" \
43-
TEST_LLNODE_DEBUG=true \
44-
LLNODE_DEBUG=true \
4543
npm test
4644

4745
.PHONY: clean

README.md

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</p>
1010

1111
[![npm](https://img.shields.io/npm/v/llnode.svg?style=flat-square)](https://npmjs.org/package/llnode)
12-
[![Build Status](https://img.shields.io/travis/nodejs/llnode.svg?style=flat-square)](https://travis-ci.org/nodejs/llnode)
12+
1313

1414
Node.js v4.x+ C++ plugin for the [LLDB](http://lldb.llvm.org) debugger.
1515

@@ -21,7 +21,18 @@ with Node.js processes or core dumps in LLDB.
2121

2222
https://asciinema.org/a/29589
2323

24-
### Quick start
24+
## Build Status
25+
26+
| Version | v6.x | v8.x | v9.x | v10.x | master | v8-canary |
27+
|---------|-------------------------|-------------------------|-------------------------|---------------------------|-------------------------------|----------------------------------|
28+
| **Trusty** | [![v6.x badge][v6-trusty-badge]][travis] | [![v8.x badge][v8-trusty-badge]][travis] | [![v9.x badge][v9-trusty-badge]][travis] | [![v10.x badge][v10-trusty-badge]][travis] | [![master badge][master-trusty-badge]][travis] | [![v8-canary badge][canary-trusty-badge]][travis] |
29+
| **OS X** | [![v6.x badge][v6-osx-badge]][travis] | [![v8.x badge][v8-osx-badge]][travis] | [![v9.x badge][v9-osx-badge]][travis] | [![v10.x badge][v10-osx-badge]][travis] | - | - |
30+
31+
We have nightly test runs against all Node.js active release lines. We also test
32+
against Node.js master and Node.js v8-canary nightly builds to help us identify
33+
breaking changes on Node.js and V8 before they land on an active release line.
34+
35+
## Quick start
2536

2637
Start an LLDB session with the llnode plugin automatically loaded:
2738

@@ -331,3 +342,17 @@ NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
331342
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
332343
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
333344
USE OR OTHER DEALINGS IN THE SOFTWARE.
345+
346+
[travis]: https://travis-ci.org/nodejs/llnode
347+
[v6-trusty-badge]: https://travis-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/1
348+
[v8-trusty-badge]: https://travis-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/2
349+
[v9-trusty-badge]: https://travis-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/3
350+
[v10-trusty-badge]: https://travis-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/4
351+
352+
[v6-osx-badge]: https://travis-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/5
353+
[v8-osx-badge]: https://travis-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/6
354+
[v9-osx-badge]: https://travis-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/7
355+
[v10-osx-badge]: https://travis-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/8
356+
357+
[master-trusty-badge]: https://travis-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/9
358+
[canary-trusty-badge]: https://travis-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/10

test/common.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ else
3131
pluginName = 'llnode.so';
3232

3333
exports.llnodePath = path.join(exports.projectDir, pluginName);
34-
exports.saveCoreTimeout = 180 * 1000;
35-
exports.loadCoreTimeout = 20 * 1000;
34+
exports.saveCoreTimeout = 360 * 1000;
35+
exports.loadCoreTimeout = 60 * 1000;
3636
exports.versionMark = /^lldb-|^lldb version/;
3737

3838
function SessionOutput(session, stream, timeout) {

0 commit comments

Comments
 (0)