Browse Source

Merge pull request #5075 from electron/upgrade-ci-node

Use node 0.10 instead of 0.8 on internal CI machines
Kevin Sawicki 9 years ago
parent
commit
1a3ede6ca5
1 changed files with 23 additions and 0 deletions
  1. 23 0
      script/cibuild

+ 23 - 0
script/cibuild

@@ -32,6 +32,9 @@ LINUX_DEPS_ARM = [
 def main():
   os.environ['CI'] = '1'
 
+  if os.environ.has_key('JANKY_SHA1'):
+    setup_nodenv()
+
   target_arch = 'x64'
   if os.environ.has_key('TARGET_ARCH'):
     target_arch = os.environ['TARGET_ARCH']
@@ -56,6 +59,8 @@ def main():
   npm = 'npm.cmd' if PLATFORM == 'win32' else 'npm'
   execute([npm, 'install', '[email protected]'])
 
+  log_versions()
+
   is_release = os.environ.has_key('ELECTRON_RELEASE')
   args = ['--target_arch=' + target_arch]
   if not is_release:
@@ -86,5 +91,23 @@ def run_script(script, args=[]):
   subprocess.check_call([sys.executable, script] + args)
 
 
+def log_versions():
+  sys.stderr.write('\nnode --version\n')
+  sys.stderr.flush()
+  subprocess.call(['node', '--version'])
+
+  sys.stderr.write('\nnpm --version\n')
+  sys.stderr.flush()
+  npm = 'npm.cmd' if PLATFORM == 'win32' else 'npm'
+  subprocess.call([npm, '--version'])
+
+
+def setup_nodenv():
+  if os.path.isdir('/usr/local/share/nodenv'):
+    os.environ['NODENV_ROOT'] = '/usr/local/share/nodenv'
+    os.environ['PATH'] = '/usr/local/share/nodenv/bin:/usr/local/share/nodenv/shims:' + os.environ['PATH']
+    os.environ['NODENV_VERSION'] = 'v0.10.21'
+
+
 if __name__ == '__main__':
   sys.exit(main())