admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use npm ci over npm install (#433)

Browse Source 
Fixes: https://github.com/emscripten-core/emscripten/issues/10291

Also fix issue where an old/incorrect version of node could be used
during SDK install since we were preferring activated versions of node.
This commit is contained in:
Sam Clegg
2020-01-28 14:32:36 -08:00
committed by GitHub
parent 3532fd3924
commit ba53d20e94
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
emsdk.py
View File

@@ -1258,12 +1258,8 @@ def is_optimizer_installed(tool):
return os.path.exists(build_root) return os.path.exists(build_root)
# Finds newest tool of given name that is active, or if none are active, finds the newest one that is installed. # Finds the newest installed version of a given tool
def find_latest_active_or_installed_tool(name): def find_latest_installed_tool(name):
for t in reversed(tools):
if t.id == name and t.is_active():
return t
for t in reversed(tools): for t in reversed(tools):
if t.id == name and t.is_installed(): if t.id == name and t.is_installed():
return t return t
@@ -1271,16 +1267,16 @@ def find_latest_active_or_installed_tool(name):
# npm install in Emscripten root directory # npm install in Emscripten root directory
def emscripten_npm_install(tool, directory): def emscripten_npm_install(tool, directory):
node_tool = find_latest_active_or_installed_tool('node') node_tool = find_latest_installed_tool('node')
if not node_tool: if not node_tool:
print('Failed to run "npm install" in installed Emscripten root directory ' + tool.installation_path() + '! Please install node.js first!') print('Failed to run "npm ci" in installed Emscripten root directory ' + tool.installation_path() + '! Please install node.js first!')
return False return False
node_path = os.path.join(node_tool.installation_path(), 'bin') node_path = os.path.join(node_tool.installation_path(), 'bin')
npm = os.path.join(node_path, 'npm' + ('.cmd' if WINDOWS else '')) npm = os.path.join(node_path, 'npm' + ('.cmd' if WINDOWS else ''))
env = os.environ.copy() env = os.environ.copy()
env["PATH"] = node_path + os.pathsep + env["PATH"] env["PATH"] = node_path + os.pathsep + env["PATH"]
subprocess.check_call([npm, 'install', '--production', '--no-audit'], cwd=directory, env=env) subprocess.check_call([npm, 'ci', '--production'], cwd=directory, env=env)
return True return True