Skip to content

Commit 01adb88

Browse files
committed
Update Makefile and CI.
1 parent 55e651c commit 01adb88

File tree

9 files changed

+29
-119
lines changed

9 files changed

+29
-119
lines changed

.travis.yml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,30 @@
11
language: "node_js"
22
node_js:
3+
- "11"
4+
- "10"
5+
- "9"
6+
- "8"
7+
- "7"
8+
- "6"
9+
- "5"
10+
- "4"
11+
- "3" # io.js
12+
- "2" # io.js
13+
- "1" # io.js
314
- "0.12"
415
- "0.10"
5-
- "iojs"
16+
- "0.8"
617

18+
19+
# NOTE: `istanbul` and `coveralls` are pinned for compatibility with node 0.8.
720
before_install:
8-
- "npm install istanbul -g"
9-
- "npm install coveralls -g"
21+
- "npm install -g istanbul@0.2.2"
22+
- "npm install -g coveralls@2.11.4"
1023

11-
script: "make ci-travis"
24+
script:
25+
- "make check"
1226

1327
after_success:
14-
- "make submit-cov-to-coveralls"
28+
- "make report-cov"
29+
30+
sudo: false

Makefile

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,7 @@
1-
SOURCES ?= lib/*.js
2-
TESTS ?= test/*.test.js
1+
include node_modules/make-node/main.mk
32

4-
test: test-mocha
5-
test-cov: test-istanbul-mocha
6-
view-cov: view-istanbul-report
7-
lint: lint-jshint
8-
lint-tests: lint-tests-jshint
3+
MOCHAFLAGS = --require ./test/bootstrap/node
94

105

11-
# ==============================================================================
12-
# Node.js
13-
# ==============================================================================
14-
include support/mk/node.mk
15-
include support/mk/mocha.mk
16-
include support/mk/istanbul.mk
17-
18-
# ==============================================================================
19-
# Analysis
20-
# ==============================================================================
21-
include support/mk/notes.mk
22-
include support/mk/jshint.mk
23-
24-
# ==============================================================================
25-
# Reports
26-
# ==============================================================================
27-
include support/mk/coveralls.mk
28-
29-
# ==============================================================================
30-
# Continuous Integration
31-
# ==============================================================================
32-
submit-cov-to-coveralls: submit-istanbul-lcov-to-coveralls
33-
34-
# Travis CI
35-
ci-travis: test test-cov
36-
37-
# ==============================================================================
38-
# Clean
39-
# ==============================================================================
40-
clean:
41-
rm -rf build
42-
rm -rf reports
43-
44-
clobber: clean clobber-node
45-
46-
47-
.PHONY: test test-cov view-cov lint lint-tests submit-cov-to-coveralls ci-travis clean clobber
6+
# Perform self-tests.
7+
check: test

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,15 @@
3535
"passport-strategy": "1.x.x"
3636
},
3737
"devDependencies": {
38-
"mocha": "1.x.x",
39-
"chai": "1.x.x",
38+
"make-node": "0.4.6",
39+
"mocha": "2.x.x",
40+
"chai": "2.x.x",
4041
"chai-passport-strategy": "0.1.x"
4142
},
4243
"engines": {
4344
"node": ">= 0.4.0"
4445
},
4546
"scripts": {
46-
"test": "node_modules/.bin/mocha --reporter spec --require test/bootstrap/node test/*.test.js"
47+
"test": "make test"
4748
}
4849
}

support/mk/coveralls.mk

Lines changed: 0 additions & 7 deletions
This file was deleted.

support/mk/istanbul.mk

Lines changed: 0 additions & 21 deletions
This file was deleted.

support/mk/jshint.mk

Lines changed: 0 additions & 10 deletions
This file was deleted.

support/mk/mocha.mk

Lines changed: 0 additions & 14 deletions
This file was deleted.

support/mk/node.mk

Lines changed: 0 additions & 8 deletions
This file was deleted.

support/mk/notes.mk

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)