Skip to content

Commit

Permalink
Update Makefile and CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredhanson committed Mar 10, 2019
1 parent 55e651c commit 01adb88
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 119 deletions.
26 changes: 21 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,30 @@
language: "node_js"
node_js:
- "11"
- "10"
- "9"
- "8"
- "7"
- "6"
- "5"
- "4"
- "3" # io.js
- "2" # io.js
- "1" # io.js
- "0.12"
- "0.10"
- "iojs"
- "0.8"


# NOTE: `istanbul` and `coveralls` are pinned for compatibility with node 0.8.
before_install:
- "npm install istanbul -g"
- "npm install coveralls -g"
- "npm install -g istanbul@0.2.2"
- "npm install -g coveralls@2.11.4"

script: "make ci-travis"
script:
- "make check"

after_success:
- "make submit-cov-to-coveralls"
- "make report-cov"

sudo: false
48 changes: 4 additions & 44 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,47 +1,7 @@
SOURCES ?= lib/*.js
TESTS ?= test/*.test.js
include node_modules/make-node/main.mk

test: test-mocha
test-cov: test-istanbul-mocha
view-cov: view-istanbul-report
lint: lint-jshint
lint-tests: lint-tests-jshint
MOCHAFLAGS = --require ./test/bootstrap/node


# ==============================================================================
# Node.js
# ==============================================================================
include support/mk/node.mk
include support/mk/mocha.mk
include support/mk/istanbul.mk

# ==============================================================================
# Analysis
# ==============================================================================
include support/mk/notes.mk
include support/mk/jshint.mk

# ==============================================================================
# Reports
# ==============================================================================
include support/mk/coveralls.mk

# ==============================================================================
# Continuous Integration
# ==============================================================================
submit-cov-to-coveralls: submit-istanbul-lcov-to-coveralls

# Travis CI
ci-travis: test test-cov

# ==============================================================================
# Clean
# ==============================================================================
clean:
rm -rf build
rm -rf reports

clobber: clean clobber-node


.PHONY: test test-cov view-cov lint lint-tests submit-cov-to-coveralls ci-travis clean clobber
# Perform self-tests.
check: test
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,15 @@
"passport-strategy": "1.x.x"
},
"devDependencies": {
"mocha": "1.x.x",
"chai": "1.x.x",
"make-node": "0.4.6",
"mocha": "2.x.x",
"chai": "2.x.x",
"chai-passport-strategy": "0.1.x"
},
"engines": {
"node": ">= 0.4.0"
},
"scripts": {
"test": "node_modules/.bin/mocha --reporter spec --require test/bootstrap/node test/*.test.js"
"test": "make test"
}
}
7 changes: 0 additions & 7 deletions support/mk/coveralls.mk

This file was deleted.

21 changes: 0 additions & 21 deletions support/mk/istanbul.mk

This file was deleted.

10 changes: 0 additions & 10 deletions support/mk/jshint.mk

This file was deleted.

14 changes: 0 additions & 14 deletions support/mk/mocha.mk

This file was deleted.

8 changes: 0 additions & 8 deletions support/mk/node.mk

This file was deleted.

7 changes: 0 additions & 7 deletions support/mk/notes.mk

This file was deleted.

0 comments on commit 01adb88

Please sign in to comment.