Skip to content

Commit 6bb2fc6

Browse files
committed
Merge branch 'Kikobeats-travis-node' into dev
* Kikobeats-travis-node: Restore linter run in travis Upgrade nvm node version WIP WIP Run builds from last node LTS and stable
2 parents ade338f + bd926ae commit 6bb2fc6

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.4.3
1+
6.9.2

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,9 @@ sudo: false
33
language: node_js
44

55
node_js:
6-
- 6
7-
- 4
6+
- "node"
7+
- "lts/*"
8+
9+
script:
10+
- npm run lint
11+
- npm test

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,10 @@
104104
"patch": "bumped release patch",
105105
"prebuild": "npm run clean",
106106
"prepublish": "npm run build",
107-
"pretest": "npm run lint",
108107
"release": "bumped release",
109108
"start": "cross-env NODE_ENV=development UV_THREADPOOL_SIZE=100 node ./server",
110-
"test": "node --harmony_proxies node_modules/.bin/jest --maxWorkers 4",
111-
"test:watch": "node --harmony_proxies node_modules/.bin/jest --watch --no-watchman",
109+
"test": "jest",
110+
"test:watch": "jest --watch --no-watchman",
112111
"tsd": "cpx \"./components/**/*.d.ts\" ./lib"
113112
},
114113
"license": "MIT",

0 commit comments

Comments
 (0)