Skip to content

Commit 13d65ca

Browse files
authored
Merge pull request #447 from aminya/5.x
Use Node 14 + MSVC 2017
2 parents 987e217 + 5536234 commit 13d65ca

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,42 @@ node_js:
33
- "6"
44
- "8"
55
- "10"
6-
- "11"
7-
- "13"
6+
- "12"
7+
- "14"
88
sudo: required
99

1010
matrix:
1111
include:
1212
- os: linux
1313
dist: bionic
14-
node_js: 12
14+
node_js: 14
1515
env:
1616
- DEPLOY="true"
1717
- MAIN="true"
1818
- os: linux
1919
dist: trusty
20-
node_js: 12
20+
node_js: 14
2121
env:
2222
- DEPLOY="true"
2323
- ARCH="armv7"
2424
- os: linux
2525
dist: trusty
26-
node_js: 12
26+
node_js: 14
2727
env:
2828
- DEPLOY="true"
2929
- ARCH="armv8"
3030
- os: linux
3131
dist: bionic
32-
node_js: 12
32+
node_js: 14
3333
env:
3434
- DEPLOY="true"
3535
- ELECTRON="9.4.4"
3636
- os: osx
37-
node_js: 12
37+
node_js: 14
3838
env:
3939
- DEPLOY="true"
4040
- os: osx
41-
node_js: 12
41+
node_js: 14
4242
env:
4343
- DEPLOY="true"
4444
- ELECTRON="9.4.4"

appveyor.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ environment:
22
GITHUB_TOKEN:
33
secure: E1HpiZf9OJuc8XPGA57hJbCQlMWVCPVBePHiWF/BgmJ/+e/2OplyifiS/x8CJtcw
44
matrix:
5-
- nodejs_version: "12"
5+
- nodejs_version: "14"
66
deploy: "true"
7-
- nodejs_version: "12"
7+
- nodejs_version: "14"
88
electron: "9.4.4"
99
deploy: "true"
1010

11+
image: Visual Studio 2017
12+
1113
platform:
1214
- x64
1315
- x86

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"electron-mocha": "^6.0.0",
1717
"jsdoc": "^3.5.4",
1818
"mocha": "^5.0.0",
19+
"node-abi": "^2.21.0",
1920
"nyc": "^12.0.2",
2021
"prebuild": "^10.0.1",
2122
"semver": "^5.4.1",

0 commit comments

Comments
 (0)