Skip to content

Commit

Permalink
Merge pull request #461 from Clever/node-12
Browse files Browse the repository at this point in the history
upgrade to node 12
  • Loading branch information
prime-time authored Jan 15, 2020
2 parents 20612e0 + 7043120 commit 23b4e91
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
build:
working_directory: ~/Clever/components
docker:
- image: circleci/node:10.15.3-stretch
- image: circleci/node:12-stretch
environment:
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include node.mk

SHELL = /bin/bash
NODE_VERSION := "v10"
NODE_VERSION := "v12"
$(eval $(call node-version-check,$(NODE_VERSION)))

JEST := ./node_modules/.bin/jest --maxWorkers=1 --config ./jestconfig.json
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"devDependencies": {
"@types/jest": "^20.0.8",
"@types/jest-matchers": "^20.0.0",
"@types/node": "^10.14.12",
"@types/node": "^12.12.24",
"@types/react": "^16.8.6",
"@typescript-eslint/eslint-plugin": "^1.9.0",
"@typescript-eslint/parser": "^1.9.0",
Expand Down

0 comments on commit 23b4e91

Please sign in to comment.