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

Install npm before cleaning node_modules

Browse source
This commit is contained in:
Cheng Zhao 2015-07-02 22:45:26 +08:00
parent ddaf005c2b
commit 1e9af82bf6
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
script/cibuild
View file

@ -45,10 +45,6 @@ def main():
os.environ['DISPLAY'] = ':99.0' os.environ['DISPLAY'] = ':99.0'
execute(['sh', '-e', '/etc/init.d/xvfb', 'start']) execute(['sh', '-e', '/etc/init.d/xvfb', 'start'])
# CI's npm is not reliable.
npm = 'npm.cmd' if sys.platform == 'win32' else 'npm'
execute([npm, 'install', 'npm'])
rm_rf(os.path.join(SOURCE_ROOT, 'out')) rm_rf(os.path.join(SOURCE_ROOT, 'out'))
rm_rf(os.path.join(SOURCE_ROOT, 'node_modules')) rm_rf(os.path.join(SOURCE_ROOT, 'node_modules'))
rm_rf(os.path.join(SOURCE_ROOT, 'frameworks')) rm_rf(os.path.join(SOURCE_ROOT, 'frameworks'))
@ -57,6 +53,10 @@ def main():
rm_rf(os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', 'download', rm_rf(os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', 'download',
'libchromiumcontent')) 'libchromiumcontent'))
# CI's npm is not reliable.
npm = 'npm.cmd' if sys.platform == 'win32' else 'npm'
execute([npm, 'install', 'npm'])
run_script('bootstrap.py', ['--dev', '--target_arch=' + target_arch]) run_script('bootstrap.py', ['--dev', '--target_arch=' + target_arch])
run_script('cpplint.py') run_script('cpplint.py')