Fix cibuild script for Windows

brave · Dec 22, 2015 · de349e8 · de349e8
1 parent 3eb5254
commit de349e8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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.'