From 004d25d2489916e8a39d092e6ddf0ab327a2a7fa Mon Sep 17 00:00:00 2001 From: Mark Lee Date: Sat, 10 Sep 2016 08:59:40 -0700 Subject: [PATCH 01/11] Upgrade electron-download for checksum support Fixes #51. --- npm/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/npm/package.json b/npm/package.json index 940c1375f713..fbbf22b8b0cc 100644 --- a/npm/package.json +++ b/npm/package.json @@ -15,11 +15,11 @@ "main": "index.js", "dependencies": { "extract-zip": "^1.0.3", - "electron-download": "^2.0.0" + "electron-download": "^2.2.0" }, "devDependencies": { "home-path": "^0.1.1", - "path-exists": "^1.0.0", + "path-exists": "^2.0.0", "standard": "^5.4.1", "tape": "^3.0.1" }, @@ -31,4 +31,4 @@ "keywords": [ "electron" ] -} \ No newline at end of file +} From 94f05d350bf8f577692717f730a3e349adf99ace Mon Sep 17 00:00:00 2001 From: Mark Lee Date: Sat, 10 Sep 2016 09:02:25 -0700 Subject: [PATCH 02/11] Travis: test against Node >= 4 on Linux & OSX --- npm/.travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/npm/.travis.yml b/npm/.travis.yml index 991d04b6e227..a374ed2c0a97 100644 --- a/npm/.travis.yml +++ b/npm/.travis.yml @@ -1,5 +1,8 @@ +os: +- linux +- osx language: node_js node_js: - - '0.10' - - '0.12' - - 'iojs' +- '4' +- '5' +- '6' From 119535525faa708daf5207c1ec64f06403639e42 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 19 Sep 2016 13:38:48 -0700 Subject: [PATCH 03/11] :arrow_up: electron-download@3.0.0 --- npm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/package.json b/npm/package.json index fbbf22b8b0cc..f0ef1742dd86 100644 --- a/npm/package.json +++ b/npm/package.json @@ -15,7 +15,7 @@ "main": "index.js", "dependencies": { "extract-zip": "^1.0.3", - "electron-download": "^2.2.0" + "electron-download": "^3.0.0" }, "devDependencies": { "home-path": "^0.1.1", From 5cbc2abf614571937c286612469e94ade3496e72 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 19 Sep 2016 13:40:17 -0700 Subject: [PATCH 04/11] Build on node 0.10/0.12 --- npm/.travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/npm/.travis.yml b/npm/.travis.yml index a374ed2c0a97..9dbea0f239fb 100644 --- a/npm/.travis.yml +++ b/npm/.travis.yml @@ -3,6 +3,8 @@ os: - osx language: node_js node_js: +- '0.10' +- '0.12' - '4' - '5' - '6' From 9fd625fb9b6be7f3abf0bbaced9094fd2b0cb0c4 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 19 Sep 2016 13:46:37 -0700 Subject: [PATCH 05/11] Add initial AppVeyor config --- npm/appveyor.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 npm/appveyor.yml diff --git a/npm/appveyor.yml b/npm/appveyor.yml new file mode 100644 index 000000000000..abe461df8e8a --- /dev/null +++ b/npm/appveyor.yml @@ -0,0 +1,25 @@ +build: off + +branches: + only: + - master + +environment: + matrix: + - nodejs_version: "0.10" + - nodejs_version: "0.12" + - nodejs_version: "4" + - nodejs_version: "5" + - nodejs_version: "6" + +skip_tags: true + +install: + - ps: Install-Product node $env:nodejs_version + - npm install npm + - .\node_modules\.bin\npm install + +test_script: + - node --version + - .\node_modules\.bin\npm --version + - .\node_modules\.bin\npm test From d0a509a9158b891eb25902d2950692856957cbad Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 19 Sep 2016 13:48:05 -0700 Subject: [PATCH 06/11] npm ignore more meta files and tests --- npm/.npmignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/npm/.npmignore b/npm/.npmignore index fe67adfa7c33..de77ba146f1b 100644 --- a/npm/.npmignore +++ b/npm/.npmignore @@ -1,2 +1,8 @@ dist/ path.txt +.npmignore +.travis.yml +appveyor.yml +CONTRIBUTING.md +issue_template.md +test/ From fb1a5a4646b9bb26cb988f3aa6737eaa97e88c1e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 19 Sep 2016 13:48:54 -0700 Subject: [PATCH 07/11] Only build master branch on Travis --- npm/.travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/npm/.travis.yml b/npm/.travis.yml index 9dbea0f239fb..74c248d30a9c 100644 --- a/npm/.travis.yml +++ b/npm/.travis.yml @@ -8,3 +8,6 @@ node_js: - '4' - '5' - '6' +branches: + only: + - master From 082c1da548bd2a0bc9449b61ee46fc1aa2fdb2b7 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 19 Sep 2016 14:05:53 -0700 Subject: [PATCH 08/11] Add AppVeyor badge --- npm/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/npm/README.md b/npm/README.md index 8657b4c083b6..b649e2beee88 100644 --- a/npm/README.md +++ b/npm/README.md @@ -1,6 +1,7 @@ # electron-prebuilt -[![build status](http://img.shields.io/travis/electron-userland/electron-prebuilt.svg?style=flat)](http://travis-ci.org/electron-userland/electron-prebuilt) +[![Travis build status](http://img.shields.io/travis/electron-userland/electron-prebuilt.svg?style=flat)](http://travis-ci.org/electron-userland/electron-prebuilt) +[![AppVeyor build status](https://ci.appveyor.com/api/projects/status/qd978ky9axl8m1m1?svg=true)](https://ci.appveyor.com/project/Atom/electron-prebuilt) [![badge](https://nodei.co/npm/electron-prebuilt.png?downloads=true)](https://www.npmjs.com/package/electron-prebuilt) From fb2f4ae5282a4c97fa445ec4868eecf13b97baca Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 19 Sep 2016 14:32:11 -0700 Subject: [PATCH 09/11] Set quiet to true when loglevel is silent --- npm/install.js | 8 +++++++- npm/package.json | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/npm/install.js b/npm/install.js index 5ec84203b8b8..1dcf5aff0afe 100755 --- a/npm/install.js +++ b/npm/install.js @@ -36,7 +36,13 @@ if (installedVersion === version && fs.existsSync(path.join(__dirname, paths[pla } // downloads if not cached -download({version: version, platform: process.env.npm_config_platform, arch: process.env.npm_config_arch, strictSSL: process.env.npm_config_strict_ssl === 'true'}, extractFile) +download({ + version: version, + platform: process.env.npm_config_platform, + arch: process.env.npm_config_arch, + strictSSL: process.env.npm_config_strict_ssl === 'true', + quiet: process.env.npm_config_loglevel === 'silent', +}, extractFile) // unzips and makes path.txt point at the correct executable function extractFile (err, zipPath) { diff --git a/npm/package.json b/npm/package.json index f0ef1742dd86..29bbe3410515 100644 --- a/npm/package.json +++ b/npm/package.json @@ -6,8 +6,8 @@ "scripts": { "cache-clean": "rm -rf ~/.electron && rm -rf dist", "postinstall": "node install.js", - "pretest": "npm run cache-clean && node install.js", - "test": "standard && tape test/*.js" + "pretest": "npm run cache-clean && npm --silent run postinstall", + "test": "tape test/*.js && standard" }, "bin": { "electron": "cli.js" From 557d062b7f6b430b5ad4343f89e771b13c448e84 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 19 Sep 2016 14:36:07 -0700 Subject: [PATCH 10/11] Remove trailing comma --- npm/install.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/install.js b/npm/install.js index 1dcf5aff0afe..e6a273a5ad33 100755 --- a/npm/install.js +++ b/npm/install.js @@ -41,7 +41,7 @@ download({ platform: process.env.npm_config_platform, arch: process.env.npm_config_arch, strictSSL: process.env.npm_config_strict_ssl === 'true', - quiet: process.env.npm_config_loglevel === 'silent', + quiet: process.env.npm_config_loglevel === 'silent' }, extractFile) // unzips and makes path.txt point at the correct executable From 1fd1474c9a160439223e63711a19caead6aac323 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 19 Sep 2016 15:01:05 -0700 Subject: [PATCH 11/11] Install silently on Travis --- npm/.travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/npm/.travis.yml b/npm/.travis.yml index 74c248d30a9c..1d8c1a38f11e 100644 --- a/npm/.travis.yml +++ b/npm/.travis.yml @@ -11,3 +11,5 @@ node_js: branches: only: - master +install: + - npm --silent install