Update node version 14.15.5 -> 15.14.0
diff --git a/docker/Dockerfile b/docker/Dockerfile index 508d7b3..6620e3c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile
@@ -64,8 +64,8 @@ # This will let use tools offered by this image inside other Docker images # (sub-stages) or with custom / no entrypoint ENV EMSDK=/emsdk \ - EMSDK_NODE=/emsdk/node/14.18.2_64bit/bin/node \ - PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/upstream/bin:/emsdk/node/14.18.2_64bit/bin:${PATH}" + EMSDK_NODE=/emsdk/node/15.14.0_64bit/bin/node \ + PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/upstream/bin:/emsdk/node/15.14.0_64bit/bin:${PATH}" # ------------------------------------------------------------------------------ # Create a 'standard` 1000:1000 user
diff --git a/emsdk_manifest.json b/emsdk_manifest.json index b69b1e7..4eb450d 100644 --- a/emsdk_manifest.json +++ b/emsdk_manifest.json
@@ -251,6 +251,55 @@ { + "id": "node", + "version": "15.14.0", + "bitness": 32, + "arch": "x86", + "windows_url": "node-v15.14.0-win-x86.zip", + "activated_path": "%installation_dir%/bin", + "activated_path_skip": "node", + "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", + "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" + }, + { + "id": "node", + "version": "15.14.0", + "arch": "arm", + "bitness": 32, + "linux_url": "node-v15.14.0-linux-armv7l.tar.xz", + "activated_path": "%installation_dir%/bin", + "activated_path_skip": "node", + "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", + "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" + }, + { + "id": "node", + "version": "15.14.0", + "bitness": 64, + "arch": "x86_64", + "macos_url": "node-v15.14.0-darwin-x64.tar.gz", + "windows_url": "node-v15.14.0-win-x64.zip", + "linux_url": "node-v15.14.0-linux-x64.tar.xz", + "activated_path": "%installation_dir%/bin", + "activated_path_skip": "node", + "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", + "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" + }, + { + "id": "node", + "version": "15.14.0", + "arch": "aarch64", + "bitness": 64, + "macos_url": "node-v15.14.0-darwin-x64.tar.gz", + "linux_url": "node-v15.14.0-linux-arm64.tar.xz", + "activated_path": "%installation_dir%/bin", + "activated_path_skip": "node", + "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", + "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" + }, + + + { "id": "python", "version": "2.7.13.1", "bitness": 32, @@ -553,19 +602,19 @@ { "version": "main", "bitness": 64, - "uses": ["python-3.9.2-nuget-64bit", "llvm-git-main-64bit", "node-14.18.2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"], + "uses": ["python-3.9.2-nuget-64bit", "llvm-git-main-64bit", "node-15.14.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"], "os": "win" }, { "version": "main", "bitness": 64, - "uses": ["python-3.9.2-64bit", "llvm-git-main-64bit", "node-14.18.2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"], + "uses": ["python-3.9.2-64bit", "llvm-git-main-64bit", "node-15.14.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"], "os": "macos" }, { "version": "main", "bitness": 64, - "uses": ["llvm-git-main-64bit", "node-14.18.2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"], + "uses": ["llvm-git-main-64bit", "node-15.14.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"], "os": "linux" }, { @@ -577,14 +626,14 @@ { "version": "releases-%releases-tag%", "bitness": 64, - "uses": ["node-14.18.2-64bit", "releases-%releases-tag%-64bit"], + "uses": ["node-15.14.0-64bit", "releases-%releases-tag%-64bit"], "os": "linux", "custom_install_script": "emscripten_npm_install" }, { "version": "releases-%releases-tag%", "bitness": 64, - "uses": ["node-14.18.2-64bit", "python-3.9.2-64bit", "releases-%releases-tag%-64bit"], + "uses": ["node-15.14.0-64bit", "python-3.9.2-64bit", "releases-%releases-tag%-64bit"], "os": "macos", "arch": "x86_64", "custom_install_script": "emscripten_npm_install" @@ -592,7 +641,7 @@ { "version": "releases-%releases-tag%", "bitness": 64, - "uses": ["node-14.18.2-64bit", "python-3.9.2-64bit", "releases-%releases-tag%-64bit"], + "uses": ["node-15.14.0-64bit", "python-3.9.2-64bit", "releases-%releases-tag%-64bit"], "os": "macos", "arch": "aarch64", "custom_install_script": "emscripten_npm_install" @@ -600,7 +649,7 @@ { "version": "releases-%releases-tag%", "bitness": 64, - "uses": ["node-14.18.2-64bit", "python-3.9.2-nuget-64bit", "java-8.152-64bit", "releases-%releases-tag%-64bit"], + "uses": ["node-15.14.0-64bit", "python-3.9.2-nuget-64bit", "java-8.152-64bit", "releases-%releases-tag%-64bit"], "os": "win", "custom_install_script": "emscripten_npm_install" }
diff --git a/scripts/update_node.py b/scripts/update_node.py index 95a245e..189a7f6 100755 --- a/scripts/update_node.py +++ b/scripts/update_node.py
@@ -16,11 +16,12 @@ import os import shutil -version = '14.18.2' -base = 'https://nodejs.org/dist/latest-v14.x/' +version = '15.14.0' +base = 'https://nodejs.org/dist/latest-v15.x/' upload_base = 'gs://webassembly/emscripten-releases-builds/deps/' suffixes = [ + '-win-x86.zip', '-win-x64.zip', '-darwin-x64.tar.gz', '-linux-x64.tar.xz',
diff --git a/test/test.py b/test/test.py index 98557a6..a1515b6 100755 --- a/test/test.py +++ b/test/test.py
@@ -174,9 +174,9 @@ # 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-14.18.2-64bit') - checked_call_with_output(emsdk + ' install node-14.18.2-64bit', expected='Downloading:', unexpected='already installed') - checked_call_with_output(emsdk + ' install node-14.18.2-64bit', unexpected='Downloading:', expected='already installed') + checked_call_with_output(emsdk + ' uninstall node-15.14.0-64bit') + checked_call_with_output(emsdk + ' install node-15.14.0-64bit', expected='Downloading:', unexpected='already installed') + checked_call_with_output(emsdk + ' install node-15.14.0-64bit', unexpected='Downloading:', expected='already installed') def test_tot_upstream(self): print('test update-tags')