From d3308cf8c34bf15e6eaf903b52c7d03de602f793 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 Apr 2016 09:53:33 -0700 Subject: [PATCH 1/8] Use node 0.10.21 on CI --- script/cibuild | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/script/cibuild b/script/cibuild index 54cfa508910..de4dca50bb8 100755 --- a/script/cibuild +++ b/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'] @@ -86,5 +89,12 @@ def run_script(script, args=[]): subprocess.check_call([sys.executable, script] + args) +def setup_nodenv(): + if os.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()) From 7e87973d60718a8eeaa456a9318f873c8802d42f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 Apr 2016 09:55:23 -0700 Subject: [PATCH 2/8] Log version to verify --- script/cibuild | 1 + 1 file changed, 1 insertion(+) diff --git a/script/cibuild b/script/cibuild index de4dca50bb8..c9332040094 100755 --- a/script/cibuild +++ b/script/cibuild @@ -94,6 +94,7 @@ def setup_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' + subprocess.call(["node", "--version"]) if __name__ == '__main__': From 0fad8fdc4b331175454213449dd2c72450b0b46f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 Apr 2016 09:56:04 -0700 Subject: [PATCH 3/8] Add missing .path --- script/cibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index c9332040094..0e9f764f7c1 100755 --- a/script/cibuild +++ b/script/cibuild @@ -90,7 +90,7 @@ def run_script(script, args=[]): def setup_nodenv(): - if os.isdir('/usr/local/share/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' From a74b9607b61f057c4d36b5de2cce01cf2dbf3a85 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 Apr 2016 09:59:46 -0700 Subject: [PATCH 4/8] Add more logging --- script/cibuild | 1 + 1 file changed, 1 insertion(+) diff --git a/script/cibuild b/script/cibuild index 0e9f764f7c1..0f65c4eb3b2 100755 --- a/script/cibuild +++ b/script/cibuild @@ -94,6 +94,7 @@ def setup_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' + print('configured nodenv') subprocess.call(["node", "--version"]) From e95224deabb7a0483b56d0caf1b2fcfd9bc5695d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 Apr 2016 10:00:23 -0700 Subject: [PATCH 5/8] Remove += --- script/cibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index 0f65c4eb3b2..ce847177fa4 100755 --- a/script/cibuild +++ b/script/cibuild @@ -92,7 +92,7 @@ def run_script(script, args=[]): 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['PATH'] = '/usr/local/share/nodenv/bin:/usr/local/share/nodenv/shims:' + os.environ['PATH'] os.environ['NODENV_VERSION'] = 'v0.10.21' print('configured nodenv') subprocess.call(["node", "--version"]) From 687a512b11e05c768aba4860617460c157546e6c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 Apr 2016 10:03:16 -0700 Subject: [PATCH 6/8] Log node and npm versions --- script/cibuild | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/script/cibuild b/script/cibuild index ce847177fa4..90ee9e42f44 100755 --- a/script/cibuild +++ b/script/cibuild @@ -59,6 +59,8 @@ def main(): npm = 'npm.cmd' if PLATFORM == 'win32' else 'npm' execute([npm, 'install', 'npm@2.12.1']) + log_versions() + is_release = os.environ.has_key('ELECTRON_RELEASE') args = ['--target_arch=' + target_arch] if not is_release: @@ -89,13 +91,21 @@ 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() + 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' - print('configured nodenv') - subprocess.call(["node", "--version"]) if __name__ == '__main__': From 10860e4ec55f575ee0bd7f1b460ed4ced314ac7a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 Apr 2016 10:14:47 -0700 Subject: [PATCH 7/8] Use npm.cmd on Windows to print version --- script/cibuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index 90ee9e42f44..141d831a105 100755 --- a/script/cibuild +++ b/script/cibuild @@ -98,7 +98,8 @@ def log_versions(): sys.stderr.write('\nnpm --version\n') sys.stderr.flush() - subprocess.call(["npm", "--version"]) + npm = 'npm.cmd' if PLATFORM == 'win32' else 'npm' + subprocess.call([npm, "--version"]) def setup_nodenv(): From 4041d52864aef4c921c028d6d65a99707e0fafdd Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 Apr 2016 10:15:31 -0700 Subject: [PATCH 8/8] Use single quotes --- script/cibuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/cibuild b/script/cibuild index 141d831a105..fda5817b6b8 100755 --- a/script/cibuild +++ b/script/cibuild @@ -94,12 +94,12 @@ def run_script(script, args=[]): def log_versions(): sys.stderr.write('\nnode --version\n') sys.stderr.flush() - subprocess.call(["node", "--version"]) + 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"]) + subprocess.call([npm, '--version']) def setup_nodenv():