Skip to content
This repository has been archived by the owner on Mar 13, 2023. It is now read-only.

Commit

Permalink
Add support for Node.js 7 (#93)
Browse files Browse the repository at this point in the history
* Update Makefile

* Add support for Node.js 7
  • Loading branch information
rowanmanning committed Dec 2, 2016
1 parent c91353e commit f09eba3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -5,7 +5,7 @@ matrix:
include:

# Run linter once
- node_js: '6'
- node_js: '7'
env: LINT=true

# Run tests
Expand All @@ -14,6 +14,7 @@ matrix:
- node_js: '4'
- node_js: '5'
- node_js: '6'
- node_js: '7'

# Restrict builds on branches
branches:
Expand Down
13 changes: 8 additions & 5 deletions Makefile.node
Expand Up @@ -21,14 +21,14 @@
NPM_BIN = ./node_modules/.bin
export PATH := $(NPM_BIN):$(PATH)
export EXPECTED_COVERAGE := 90
export INTEGRATION_TIMEOUT := 5000
export INTEGRATION_SLOW := 4000


# Output helpers
# --------------

C_GREEN=\x1b[32;01m
C_RESET=\x1b[0m
TASK_DONE = echo "$(C_GREEN)✓ $@ done$(C_RESET)"
TASK_DONE = echo "✓ $@ done"


# Group tasks
Expand Down Expand Up @@ -57,12 +57,15 @@ node_modules: package.json
# Verify tasks
# ------------

verify: verify-javascript verify-spaces
verify: verify-javascript verify-dust verify-spaces
@$(TASK_DONE)

verify-javascript: verify-eslint verify-jshint verify-jscs
@$(TASK_DONE)

verify-dust:
@if [ -e .dustmiterc ]; then dustmite --path ./view && $(TASK_DONE); fi

verify-eslint:
@if [ -e .eslintrc ]; then eslint . && $(TASK_DONE); fi

Expand Down Expand Up @@ -101,7 +104,7 @@ test-unit-coverage:
fi

test-integration:
@if [ -d test/integration ]; then mocha test/integration && $(TASK_DONE); fi
@if [ -d test/integration ]; then mocha test/integration --timeout $(INTEGRATION_TIMEOUT) --slow $(INTEGRATION_SLOW) && $(TASK_DONE); fi


# Tooling tasks
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -307,6 +307,6 @@ Copyright © 2015, Rowan Manning
[info-build]: https://travis-ci.org/rowanmanning/joblint
[shield-dependencies]: https://img.shields.io/gemnasium/rowanmanning/joblint.svg
[shield-license]: https://img.shields.io/badge/license-MIT-blue.svg
[shield-node]: https://img.shields.io/badge/node.js%20support-0.10–6-brightgreen.svg
[shield-node]: https://img.shields.io/badge/node.js%20support-0.10–7-brightgreen.svg
[shield-npm]: https://img.shields.io/npm/v/joblint.svg
[shield-build]: https://img.shields.io/travis/rowanmanning/joblint/master.svg

0 comments on commit f09eba3

Please sign in to comment.