From 1e9af82bf6f61e8da44b69f3bfbf140164400e96 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 2 Jul 2015 22:45:26 +0800 Subject: [PATCH] Install npm before cleaning node_modules --- script/cibuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/cibuild b/script/cibuild index ef10977f33b2..a4a58caea4d0 100755 --- a/script/cibuild +++ b/script/cibuild @@ -45,10 +45,6 @@ def main(): os.environ['DISPLAY'] = ':99.0' 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, 'node_modules')) 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', '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('cpplint.py')