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

Remove unneeded nodenv setup

Browse source
This commit is contained in:
Kevin Sawicki 2017-07-21 10:05:12 -07:00 • committed by Aleksei Kuzmin
parent bbd1b325fb
commit 5737f8b74e
1 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
script/cibuild
View file

@ -38,9 +38,6 @@ LINUX_DEPS_ARM = [
def main(): def main():
os.environ['CI'] = '1' os.environ['CI'] = '1'
if os.environ.has_key('JANKY_SHA1'):
setup_nodenv()
# Ignore the CXX and CC env in CI. # Ignore the CXX and CC env in CI.
try: try:
del os.environ['CC'] del os.environ['CC']
@ -79,7 +76,7 @@ def main():
os.environ['PATH'] = os.path.pathsep.join([node_bin_dir, os.environ['PATH'] = os.path.pathsep.join([node_bin_dir,
os.environ.get('PATH', '')]) os.environ.get('PATH', '')])
is_release = os.environ.has_key('ELECTRON_RELEASE') is_release = os.environ.get('ELECTRON_RELEASE', '') == '1'
args = ['--target_arch=' + target_arch] args = ['--target_arch=' + target_arch]
if not is_release: if not is_release:
args += ['--dev'] args += ['--dev']
@ -119,15 +116,5 @@ def log_versions():
subprocess.call([npm, '--version']) subprocess.call([npm, '--version'])
def setup_nodenv():
if os.path.isdir('/usr/local/share/nodenv'):
nodenv_root = os.path.join(os.environ['HOME'], '.nodenv')
os.environ['NODENV_ROOT'] = nodenv_root
os.environ['PATH'] = nodenv_root + '/bin:' + nodenv_root + '/shims:' + os.environ['PATH']
os.environ['NODENV_VERSION'] = 'v4.5.0'
subprocess.check_call(['/usr/local/share/nodenv/bin/nodenv', 'install', os.environ['NODENV_VERSION']])
subprocess.check_call(['/usr/local/share/nodenv/bin/nodenv', 'rehash'])
if __name__ == '__main__': if __name__ == '__main__':
sys.exit(main()) sys.exit(main())