Skip to content

Commit d8dae1d

Browse files
authored
Merge pull request #107 from lgeiger/bump
Bump prebuild@4.5.0 and dev-deps
2 parents 1ca7804 + 9ed0079 commit d8dae1d

File tree

3 files changed

+10
-15
lines changed

3 files changed

+10
-15
lines changed

.travis.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ matrix:
1414
- node_js: "6"
1515
env: DEPLOY="true"
1616
- node_js: "6"
17-
env: ELECTRON="1.1.3"
18-
- node_js: "6"
19-
env: ELECTRON="1.4.4" REBUILD="true"
17+
env: ELECTRON="1.4.10"
2018
- os: osx
2119
node_js: "6"
2220
env: DEPLOY="true"
@@ -31,9 +29,8 @@ before_install:
3129
- test "$(uname)" = "Darwin" || export CXX=g++-4.9 CC=gcc-4.9
3230

3331
install:
34-
- npm install
35-
- '[ -z "$ELECTRON" ] || npm install electron-prebuilt@${ELECTRON}'
36-
- '[ -z "$REBUILD" ] || ./node_modules/node-gyp/bin/node-gyp.js rebuild --runtime=electron --target=${ELECTRON} --disturl=https://atom.io/download/atom-shell --build-from-source'
32+
- '[ -z "$ELECTRON" ] || npm install electron@${ELECTRON}'
33+
- 'if [[ -z "$ELECTRON" ]]; then npm install; else npm install --runtime=electron --target=${ELECTRON} --disturl=https://atom.io/download/electron; fi'
3734

3835
script: if [[ -z "$ELECTRON" ]]; then travis_retry npm run coverage; else travis_retry npm run test:electron; fi
3936

appveyor.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ environment:
55
- nodejs_version: "4"
66
deploy: "true"
77
- nodejs_version: "6"
8-
electron: "1.4.4"
8+
electron: "1.4.10"
99

1010
platform:
1111
- x64
@@ -15,10 +15,8 @@ build: off
1515

1616
install:
1717
- ps: Install-Product node $env:nodejs_version $env:platform
18-
- npm install
19-
- IF DEFINED ELECTRON (npm install electron-prebuilt@%ELECTRON%)
20-
# We always need to rebuild for electron even for electron <= 1.1.3
21-
- IF DEFINED ELECTRON (node_modules\.bin\node-gyp rebuild --runtime=electron --target=%ELECTRON% --disturl=https://atom.io/download/atom-shell --build-from-source)
18+
- IF DEFINED ELECTRON (npm install electron@%ELECTRON%)
19+
- IF DEFINED ELECTRON (npm install --runtime=electron --target=%ELECTRON% --disturl=https://atom.io/download/electron) ELSE (npm install)
2220

2321

2422
test_script:

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
},
1111
"dependencies": {
1212
"nan": "^2.4.0",
13-
"prebuild": "^4.4.0"
13+
"prebuild": "^4.5.0"
1414
},
1515
"devDependencies": {
16-
"electron-mocha": "^3.1.1",
16+
"electron-mocha": "^3.2.1",
1717
"jsdoc": "^3.4.2",
18-
"mocha": "^3.1.0",
19-
"nyc": "^8.3.1",
18+
"mocha": "^3.2.0",
19+
"nyc": "^10.0.0",
2020
"semver": "^5.3.0",
2121
"should": "^11.1.0"
2222
},

0 commit comments

Comments
 (0)