Skip to content

Commit 8c38d2f

Browse files
authored
Upgrade node from v16.20.0 to v18.20.3 (#1387)
Node v18 is that current LTS release of node and v18.20.3 is the latest release of v18. This change means that emsdk is no longer installable on Ubuntu/Bionic 18.04, and we now require Ubuntu/Focal 20.04. See: #1183 Fixes: #1173
1 parent fc9146e commit 8c38d2f

File tree

3 files changed

+58
-10
lines changed

3 files changed

+58
-10
lines changed

docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ COPY --from=stage_build /emsdk /emsdk
6363
# using `--entrypoint /bin/bash` in CLI).
6464
# This corresponds to the env variables set during: `source ./emsdk_env.sh`
6565
ENV EMSDK=/emsdk \
66-
PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/node/16.20.0_64bit/bin:${PATH}"
66+
PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/node/18.20.3_64bit/bin:${PATH}"
6767

6868
# ------------------------------------------------------------------------------
6969
# Create a 'standard` 1000:1000 user

emsdk_manifest.json

+55-7
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,54 @@
346346
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
347347
},
348348

349+
{
350+
"id": "node",
351+
"version": "18.20.3",
352+
"bitness": 32,
353+
"arch": "x86",
354+
"windows_url": "node-v18.20.3-win-x86.zip",
355+
"activated_path": "%installation_dir%/bin",
356+
"activated_path_skip": "node",
357+
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
358+
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
359+
},
360+
{
361+
"id": "node",
362+
"version": "18.20.3",
363+
"arch": "arm",
364+
"bitness": 32,
365+
"linux_url": "node-v18.20.3-linux-armv7l.tar.xz",
366+
"activated_path": "%installation_dir%/bin",
367+
"activated_path_skip": "node",
368+
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
369+
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
370+
},
371+
{
372+
"id": "node",
373+
"version": "18.20.3",
374+
"bitness": 64,
375+
"arch": "x86_64",
376+
"macos_url": "node-v18.20.3-darwin-x64.tar.gz",
377+
"windows_url": "node-v18.20.3-win-x64.zip",
378+
"linux_url": "node-v18.20.3-linux-x64.tar.xz",
379+
"activated_path": "%installation_dir%/bin",
380+
"activated_path_skip": "node",
381+
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
382+
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
383+
},
384+
{
385+
"id": "node",
386+
"version": "18.20.3",
387+
"arch": "arm64",
388+
"bitness": 64,
389+
"macos_url": "node-v18.20.3-darwin-arm64.tar.gz",
390+
"linux_url": "node-v18.20.3-linux-arm64.tar.xz",
391+
"activated_path": "%installation_dir%/bin",
392+
"activated_path_skip": "node",
393+
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
394+
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
395+
},
396+
349397

350398
{
351399
"id": "python",
@@ -644,19 +692,19 @@
644692
{
645693
"version": "main",
646694
"bitness": 64,
647-
"uses": ["python-3.9.2-nuget-64bit", "llvm-git-main-64bit", "node-16.20.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
695+
"uses": ["python-3.9.2-nuget-64bit", "llvm-git-main-64bit", "node-18.20.3-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
648696
"os": "win"
649697
},
650698
{
651699
"version": "main",
652700
"bitness": 64,
653-
"uses": ["python-3.9.2-64bit", "llvm-git-main-64bit", "node-16.20.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
701+
"uses": ["python-3.9.2-64bit", "llvm-git-main-64bit", "node-18.20.3-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
654702
"os": "macos"
655703
},
656704
{
657705
"version": "main",
658706
"bitness": 64,
659-
"uses": ["llvm-git-main-64bit", "node-16.20.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
707+
"uses": ["llvm-git-main-64bit", "node-18.20.3-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
660708
"os": "linux"
661709
},
662710
{
@@ -668,30 +716,30 @@
668716
{
669717
"version": "releases-%releases-tag%",
670718
"bitness": 64,
671-
"uses": ["node-16.20.0-64bit", "releases-%releases-tag%-64bit"],
719+
"uses": ["node-18.20.3-64bit", "releases-%releases-tag%-64bit"],
672720
"os": "linux",
673721
"custom_install_script": "emscripten_npm_install"
674722
},
675723
{
676724
"version": "releases-%releases-tag%",
677725
"bitness": 64,
678-
"uses": ["node-16.20.0-64bit", "python-3.9.2-64bit", "releases-%releases-tag%-64bit"],
726+
"uses": ["node-18.20.3-64bit", "python-3.9.2-64bit", "releases-%releases-tag%-64bit"],
679727
"os": "macos",
680728
"arch": "x86_64",
681729
"custom_install_script": "emscripten_npm_install"
682730
},
683731
{
684732
"version": "releases-%releases-tag%",
685733
"bitness": 64,
686-
"uses": ["node-16.20.0-64bit", "python-3.9.2-64bit", "releases-%releases-tag%-64bit"],
734+
"uses": ["node-18.20.3-64bit", "python-3.9.2-64bit", "releases-%releases-tag%-64bit"],
687735
"os": "macos",
688736
"arch": "arm64",
689737
"custom_install_script": "emscripten_npm_install"
690738
},
691739
{
692740
"version": "releases-%releases-tag%",
693741
"bitness": 64,
694-
"uses": ["node-16.20.0-64bit", "python-3.9.2-nuget-64bit", "java-8.152-64bit", "releases-%releases-tag%-64bit"],
742+
"uses": ["node-18.20.3-64bit", "python-3.9.2-nuget-64bit", "java-8.152-64bit", "releases-%releases-tag%-64bit"],
695743
"os": "win",
696744
"custom_install_script": "emscripten_npm_install"
697745
}

scripts/update_node.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import os
1717
import shutil
1818

19-
version = '16.20.0'
20-
base = 'https://nodejs.org/dist/latest-v16.x/'
19+
version = '18.20.3'
20+
base = 'https://nodejs.org/dist/latest-v18.x/'
2121
upload_base = 'gs://webassembly/emscripten-releases-builds/deps/'
2222

2323
suffixes = [

0 commit comments

Comments
 (0)