Skip to content

Commit

Permalink
Merge pull request #250 from sanctuary-js/dc-node-version
Browse files Browse the repository at this point in the history
switch from Node v5.x.x to Node v6.x.x
  • Loading branch information
davidchambers authored Sep 8, 2016
2 parents 567812f + 8046e60 commit 018fe84
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ setup:
test:
$(ISTANBUL) cover node_modules/.bin/_mocha -- --recursive --timeout 10000
$(ISTANBUL) check-coverage --branches 100
ifneq ($(shell node --version | sed 's/[.][^.]*$$//'),v0.10)
ifeq ($(shell node --version | cut -d . -f 1),v6)
$(DOCTEST) -- index.js
else
@echo '[WARN] Doctests are only run in Node v6.x.x (current version is $(shell node --version))' >&2
endif
5 changes: 3 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
dependencies:
override:
- printf '%s\n' color=false progress=false >.npmrc
- rm -rf node_modules
- case $CIRCLE_NODE_INDEX in 0) make setup ;; 1) nvm exec 0.12.7 make setup ;; 2) nvm exec 4 make setup ;; 3) nvm exec 5 make setup ;; esac:
- case $CIRCLE_NODE_INDEX in 0) make setup ;; 1) nvm exec 0.12.7 make setup ;; 2) nvm exec 4 make setup ;; 3) nvm install 6 && nvm exec 6 make setup ;; esac:
parallel: true

machine:
Expand All @@ -11,5 +12,5 @@ machine:
test:
override:
- make lint
- case $CIRCLE_NODE_INDEX in 0) make test ;; 1) nvm exec 0.12.7 make test ;; 2) nvm exec 4 make test ;; 3) nvm exec 5 make test ;; esac:
- case $CIRCLE_NODE_INDEX in 0) make test ;; 1) nvm exec 0.12.7 make test ;; 2) nvm exec 4 make test ;; 3) nvm exec 6 make test ;; esac:
parallel: true
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -1983,10 +1983,10 @@
//. Right(['foo', 'bar', 'baz'])
//.
//. > S.encaseEither(S.I, JSON.parse, '[')
//. Left(new SyntaxError('Unexpected end of input'))
//. Left(new SyntaxError('Unexpected end of JSON input'))
//.
//. > S.encaseEither(S.prop('message'), JSON.parse, '[')
//. Left('Unexpected end of input')
//. Left('Unexpected end of JSON input')
//. ```
S.encaseEither =
def('encaseEither',
Expand Down

0 comments on commit 018fe84

Please sign in to comment.