mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Use lastes npm in CI.

Browse source
This commit is contained in:
Cheng Zhao 2014-03-28 09:25:53 +00:00
parent fdecf09d99
commit 7a6db019e8
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
script/bootstrap.py
View file

@ -6,7 +6,7 @@ import subprocess
import sys import sys
from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL
from lib.util import scoped_cwd from lib.util import execute, scoped_cwd
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
@ -53,13 +53,16 @@ def bootstrap_brightray(url):
def update_apm(): def update_apm():
## NB: Without this, subprocess incorrectly searches for npm.exe npm = 'npm.cmd' if sys.platform == 'win32' else 'npm'
npm_cmd = 'npm'
if sys.platform in ['win32', 'cygwin']: if os.environ.get('CI') == '1':
npm_cmd += '.cmd' execute([npm, 'install', 'npm'])
npm = os.path.join('node_modules', '.bin', 'npm')
if sys.platform == 'win32':
npm += 'cmd'
with scoped_cwd(os.path.join('vendor', 'apm')): with scoped_cwd(os.path.join('vendor', 'apm')):
subprocess.check_call([npm_cmd, 'install', '.']) subprocess.check_call([npm, 'install', '.'])
def update_node_modules(): def update_node_modules():