Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update nodejs to v12.18.1 #529

Merged
merged 3 commits into from
Jun 24, 2020
Merged

Update nodejs to v12.18.1 #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70bf935
Update nodejs to v12.18.1
dschuff Jun 23, 2020
5c31c67
update test scripts
dschuff Jun 23, 2020
75317d4
remove local mod
dschuff Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions emsdk_manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%"
Expand Down Expand Up @@ -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"
},
{
Expand All @@ -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"
},
{
Expand Down Expand Up @@ -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"
},
Expand Down
6 changes: 3 additions & 3 deletions scripts/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion scripts/update_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/'

Expand Down