Skip to content

Commit e3afbdf

Browse files
committed
Update Makefile and CI.
1 parent 99d481f commit e3afbdf

File tree

3 files changed

+14
-26
lines changed

3 files changed

+14
-26
lines changed

.travis.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
language: "node_js"
22
node_js:
3+
- "11"
4+
- "10"
5+
- "9"
6+
- "8"
7+
- "7"
8+
- "6"
39
- "5"
410
- "4"
511
- "3" # io.js
@@ -8,15 +14,15 @@ node_js:
814
- "0.12"
915
- "0.10"
1016
- "0.8"
11-
- "0.6"
1217

1318

19+
# NOTE: `istanbul` and `coveralls` are pinned for compatibility with node 0.8.
1420
before_install:
15-
- "npm install make-node@0.3.x -g"
16-
- "preinstall-compat"
21+
- "npm install -g istanbul@0.2.2"
22+
- "npm install -g [email protected]"
1723

1824
script:
19-
- "make test-cov"
25+
- "make check"
2026

2127
after_success:
2228
- "make report-cov"

Makefile

+2-20
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,7 @@
11
include node_modules/make-node/main.mk
22

3-
4-
SOURCES = lib/*.js lib/**/*.js
5-
TESTS = test/*.test.js test/**/*.test.js
6-
7-
LCOVFILE = ./reports/coverage/lcov.info
8-
93
MOCHAFLAGS = --require ./test/bootstrap/node
104

115

12-
view-docs:
13-
open ./docs/index.html
14-
15-
view-cov:
16-
open ./reports/coverage/lcov-report/index.html
17-
18-
clean: clean-docs clean-cov
19-
-rm -r $(REPORTSDIR)
20-
21-
clobber: clean
22-
-rm -r node_modules
23-
24-
25-
.PHONY: clean clobber
6+
# Perform self-tests.
7+
check: test

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"passport-oauth2": "1.x.x"
3535
},
3636
"devDependencies": {
37-
"make-node": "0.3.x",
37+
"make-node": "0.4.6",
3838
"mocha": "1.x.x",
3939
"chai": "2.x.x",
4040
"chai-passport-strategy": "1.x.x"
@@ -43,6 +43,6 @@
4343
"node": ">= 0.4.0"
4444
},
4545
"scripts": {
46-
"test": "node_modules/.bin/mocha --require test/bootstrap/node test/*.test.js test/**/*.test.js"
46+
"test": "make test"
4747
}
4848
}

0 commit comments

Comments
 (0)