diff --git a/emsdk_manifest.json b/emsdk_manifest.json index 2814d12972..9815cdfe48 100644 --- a/emsdk_manifest.json +++ b/emsdk_manifest.json @@ -188,42 +188,42 @@ }, { "id": "node", - "version": "12.9.1", + "version": "12.18.1", "bitness": 32, "arch": "x86", - "windows_url": "node-v12.9.1-win-x86.zip", + "windows_url": "node-v12.18.1-win-x86.zip", "activated_path": "%installation_dir%/bin", "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" }, { "id": "node", - "version": "12.9.1", + "version": "12.18.1", "arch": "arm", "bitness": 32, - "linux_url": "node-v12.9.1-linux-armv7l.tar.xz", + "linux_url": "node-v12.18.1-linux-armv7l.tar.xz", "activated_path": "%installation_dir%/bin", "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" }, { "id": "node", - "version": "12.9.1", + "version": "12.18.1", "bitness": 64, "arch": "x86_64", - "osx_url": "node-v12.9.1-darwin-x64.tar.gz", - "windows_url": "node-v12.9.1-win-x64.zip", - "linux_url": "node-v12.9.1-linux-x64.tar.xz", + "osx_url": "node-v12.18.1-darwin-x64.tar.gz", + "windows_url": "node-v12.18.1-win-x64.zip", + "linux_url": "node-v12.18.1-linux-x64.tar.xz", "activated_path": "%installation_dir%/bin", "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" }, { "id": "node", - "version": "12.9.1", + "version": "12.18.1", "arch": "aarch64", "bitness": 64, - "linux_url": "node-v12.9.1-linux-arm64.tar.xz", + "linux_url": "node-v12.18.1-linux-arm64.tar.xz", "activated_path": "%installation_dir%/bin", "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" @@ -469,19 +469,19 @@ { "version": "upstream-master", "bitness": 64, - "uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], + "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], "os": "win" }, { "version": "upstream-master", "bitness": 64, - "uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], + "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], "os": "osx" }, { "version": "upstream-master", "bitness": 64, - "uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], + "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], "os": "linux" }, { @@ -493,31 +493,31 @@ { "version": "fastcomp-master", "bitness": 32, - "uses": ["fastcomp-clang-master-32bit", "node-12.9.1-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-master-32bit", "binaryen-master-32bit"], + "uses": ["fastcomp-clang-master-32bit", "node-12.18.1-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-master-32bit", "binaryen-master-32bit"], "os": "win" }, { "version": "fastcomp-master", "bitness": 64, - "uses": ["fastcomp-clang-master-64bit", "node-12.9.1-64bit", "python-3.7.4-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], + "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], "os": "win" }, { "version": "fastcomp-master", "bitness": 64, - "uses": ["fastcomp-clang-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], + "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], "os": "osx" }, { "version": "fastcomp-master", "bitness": 32, - "uses": ["fastcomp-clang-master-32bit", "node-12.9.1-32bit", "emscripten-master-32bit", "binaryen-master-32bit"], + "uses": ["fastcomp-clang-master-32bit", "node-12.18.1-32bit", "emscripten-master-32bit", "binaryen-master-32bit"], "os": "linux" }, { "version": "fastcomp-master", "bitness": 64, - "uses": ["fastcomp-clang-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], + "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], "os": "linux" }, { @@ -559,42 +559,42 @@ { "version": "releases-upstream-%releases-tag%", "bitness": 64, - "uses": ["node-12.9.1-64bit", "releases-upstream-%releases-tag%-64bit"], + "uses": ["node-12.18.1-64bit", "releases-upstream-%releases-tag%-64bit"], "os": "linux", "custom_install_script": "emscripten_npm_install" }, { "version": "releases-upstream-%releases-tag%", "bitness": 64, - "uses": ["node-12.9.1-64bit", "releases-upstream-%releases-tag%-64bit"], + "uses": ["node-12.18.1-64bit", "releases-upstream-%releases-tag%-64bit"], "os": "osx", "custom_install_script": "emscripten_npm_install" }, { "version": "releases-upstream-%releases-tag%", "bitness": 64, - "uses": ["node-12.9.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"], + "uses": ["node-12.18.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"], "os": "win", "custom_install_script": "emscripten_npm_install" }, { "version": "releases-fastcomp-%releases-tag%", "bitness": 64, - "uses": ["node-12.9.1-64bit", "releases-fastcomp-%releases-tag%-64bit"], + "uses": ["node-12.18.1-64bit", "releases-fastcomp-%releases-tag%-64bit"], "os": "linux", "custom_install_script": "emscripten_npm_install" }, { "version": "releases-fastcomp-%releases-tag%", "bitness": 64, - "uses": ["node-12.9.1-64bit", "releases-fastcomp-%releases-tag%-64bit"], + "uses": ["node-12.18.1-64bit", "releases-fastcomp-%releases-tag%-64bit"], "os": "osx", "custom_install_script": "emscripten_npm_install" }, { "version": "releases-fastcomp-%releases-tag%", "bitness": 64, - "uses": ["node-12.9.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"], + "uses": ["node-12.18.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"], "os": "win", "custom_install_script": "emscripten_npm_install" }, diff --git a/scripts/test.py b/scripts/test.py index d8c3b01c4b..ba8d96fd68 100755 --- a/scripts/test.py +++ b/scripts/test.py @@ -157,9 +157,9 @@ def run_emsdk(cmd): # Test the normal tools like node don't re-download on re-install print('another install must re-download') -checked_call_with_output(emsdk + ' uninstall node-12.9.1-64bit') -checked_call_with_output(emsdk + ' install node-12.9.1-64bit', expected='Downloading:', unexpected='already installed') -checked_call_with_output(emsdk + ' install node-12.9.1-64bit', unexpected='Downloading:', expected='already installed') +checked_call_with_output(emsdk + ' uninstall node-12.18.1-64bit') +checked_call_with_output(emsdk + ' install node-12.18.1-64bit', expected='Downloading:', unexpected='already installed') +checked_call_with_output(emsdk + ' install node-12.18.1-64bit', unexpected='Downloading:', expected='already installed') print('test tot-upstream') run_emsdk('install tot-upstream') diff --git a/scripts/update_node.py b/scripts/update_node.py index b0e778d370..765f20678d 100755 --- a/scripts/update_node.py +++ b/scripts/update_node.py @@ -16,7 +16,7 @@ import os import shutil -version = '12.16.3' +version = '12.18.1' base = 'https://nodejs.org/dist/latest-v12.x/' upload_base = 'gs://webassembly/emscripten-releases-builds/deps/'