From 2f5ba6d2fb626aac0371149f091a76aa55ae55ee Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Sun, 13 Dec 2015 21:51:14 -0500 Subject: [PATCH] Fix cibuild script for Windows --- package.json | 1 + script/cibuild | 2 +- script/install-sysroot.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 79f1f89776..915dc8eefa 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "private": true, "scripts": { "preinstall": "node -e 'process.exit(0)'", + "cibuild-windows": "rm -Rf node_mdules && python ./script/cibuild --target_arch=x64", "test": "python ./script/test.py" }, "dependencies": { diff --git a/script/cibuild b/script/cibuild index c0798dc7e2..134cf41130 100755 --- a/script/cibuild +++ b/script/cibuild @@ -54,7 +54,7 @@ def main(): # CI's npm is not reliable. npm = 'npm.cmd' if PLATFORM == 'win32' else 'npm' - execute([npm, 'install', 'npm@2.12.1']) + execute([npm, 'install', 'npm@3.3.12']) is_release = os.environ.has_key('ELECTRON_RELEASE') args = ['--target_arch=' + target_arch] diff --git a/script/install-sysroot.py b/script/install-sysroot.py index 69acfb1326..c7758bf2b5 100755 --- a/script/install-sysroot.py +++ b/script/install-sysroot.py @@ -152,7 +152,7 @@ def main(): print 'Downloading %s' % url sys.stdout.flush() sys.stderr.flush() - subprocess.check_call(['curl', '--fail', '-L', url, '-o', tarball]) + subprocess.check_call(['curl', 'retry', 90, '--fail', '-L', url, '-o', tarball]) sha1sum = GetSha1(tarball) if sha1sum != tarball_sha1sum: print 'Tarball sha1sum is wrong.'