Skip to content

Commit 24e7881

Browse files
sbc100sbc100
authored
Minor node version update v14.15.5 -> v14.18.2 (#953)
The newer versions of eslint require 14.17.0 or above. This updates our node version to the latest in the 14.XX series. I don't expect any user-visible changes.
1 parent 82ad004 commit 24e7881

File tree

4 files changed

+66
-17
lines changed

4 files changed

+66
-17
lines changed

‎docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ COPY --from=stage_build /emsdk /emsdk
6565
# (sub-stages) or with custom / no entrypoint
6666
ENV EMSDK=/emsdk \
6767
EM_CONFIG=/emsdk/.emscripten \
68-
EMSDK_NODE=/emsdk/node/14.15.5_64bit/bin/node \
69-
PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/upstream/bin:/emsdk/node/14.15.5_64bit/bin:${PATH}"
68+
EMSDK_NODE=/emsdk/node/14.18.2_64bit/bin/node \
69+
PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/upstream/bin:/emsdk/node/14.18.2_64bit/bin:${PATH}"
7070

7171
# ------------------------------------------------------------------------------
7272
# Create a 'standard` 1000:1000 user

‎emsdk_manifest.json

Lines changed: 60 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,53 @@
258258
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%",
259259
"is_old": true
260260
},
261+
262+
263+
{
264+
"id": "node",
265+
"version": "14.18.2",
266+
"bitness": 32,
267+
"arch": "x86",
268+
"windows_url": "node-v14.18.2-win-x86.zip",
269+
"activated_path": "%installation_dir%/bin",
270+
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
271+
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
272+
},
273+
{
274+
"id": "node",
275+
"version": "14.18.2",
276+
"arch": "arm",
277+
"bitness": 32,
278+
"linux_url": "node-v14.18.2-linux-armv7l.tar.xz",
279+
"activated_path": "%installation_dir%/bin",
280+
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
281+
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
282+
},
283+
{
284+
"id": "node",
285+
"version": "14.18.2",
286+
"bitness": 64,
287+
"arch": "x86_64",
288+
"macos_url": "node-v14.18.2-darwin-x64.tar.gz",
289+
"windows_url": "node-v14.18.2-win-x64.zip",
290+
"linux_url": "node-v14.18.2-linux-x64.tar.xz",
291+
"activated_path": "%installation_dir%/bin",
292+
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
293+
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
294+
},
295+
{
296+
"id": "node",
297+
"version": "14.18.2",
298+
"arch": "aarch64",
299+
"bitness": 64,
300+
"macos_url": "node-v14.18.2-darwin-x64.tar.gz",
301+
"linux_url": "node-v14.18.2-linux-arm64.tar.xz",
302+
"activated_path": "%installation_dir%/bin",
303+
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
304+
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
305+
},
306+
307+
261308
{
262309
"id": "node",
263310
"version": "14.15.5",
@@ -301,6 +348,8 @@
301348
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
302349
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
303350
},
351+
352+
304353
{
305354
"id": "python",
306355
"version": "2.7.13.1",
@@ -595,19 +644,19 @@
595644
{
596645
"version": "upstream-main",
597646
"bitness": 64,
598-
"uses": ["python-3.9.2-1-64bit", "llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
647+
"uses": ["python-3.9.2-1-64bit", "llvm-git-main-64bit", "node-14.18.2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
599648
"os": "win"
600649
},
601650
{
602651
"version": "upstream-main",
603652
"bitness": 64,
604-
"uses": ["python-3.9.2-1-64bit", "llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
653+
"uses": ["python-3.9.2-1-64bit", "llvm-git-main-64bit", "node-14.18.2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
605654
"os": "macos"
606655
},
607656
{
608657
"version": "upstream-main",
609658
"bitness": 64,
610-
"uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
659+
"uses": ["llvm-git-main-64bit", "node-14.18.2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
611660
"os": "linux"
612661
},
613662
{
@@ -655,60 +704,60 @@
655704
{
656705
"version": "releases-upstream-%releases-tag%",
657706
"bitness": 64,
658-
"uses": ["node-14.15.5-64bit", "releases-upstream-%releases-tag%-64bit"],
707+
"uses": ["node-14.18.2-64bit", "releases-upstream-%releases-tag%-64bit"],
659708
"os": "linux",
660709
"custom_install_script": "emscripten_npm_install"
661710
},
662711
{
663712
"version": "releases-upstream-%releases-tag%",
664713
"bitness": 64,
665-
"uses": ["node-14.15.5-64bit", "python-3.9.2-1-64bit", "releases-upstream-%releases-tag%-64bit"],
714+
"uses": ["node-14.18.2-64bit", "python-3.9.2-1-64bit", "releases-upstream-%releases-tag%-64bit"],
666715
"os": "macos",
667716
"arch": "x86_64",
668717
"custom_install_script": "emscripten_npm_install"
669718
},
670719
{
671720
"version": "releases-upstream-%releases-tag%",
672721
"bitness": 64,
673-
"uses": ["node-14.15.5-64bit", "python-3.9.2-1-64bit", "releases-upstream-%releases-tag%-64bit"],
722+
"uses": ["node-14.18.2-64bit", "python-3.9.2-1-64bit", "releases-upstream-%releases-tag%-64bit"],
674723
"os": "macos",
675724
"arch": "aarch64",
676725
"custom_install_script": "emscripten_npm_install"
677726
},
678727
{
679728
"version": "releases-upstream-%releases-tag%",
680729
"bitness": 64,
681-
"uses": ["node-14.15.5-64bit", "python-3.9.2-1-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
730+
"uses": ["node-14.18.2-64bit", "python-3.9.2-1-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
682731
"os": "win",
683732
"custom_install_script": "emscripten_npm_install"
684733
},
685734
{
686735
"version": "releases-fastcomp-%releases-tag%",
687736
"bitness": 64,
688-
"uses": ["node-14.15.5-64bit", "releases-fastcomp-%releases-tag%-64bit"],
737+
"uses": ["node-14.18.2-64bit", "releases-fastcomp-%releases-tag%-64bit"],
689738
"os": "linux",
690739
"custom_install_script": "emscripten_npm_install"
691740
},
692741
{
693742
"version": "releases-fastcomp-%releases-tag%",
694743
"bitness": 64,
695-
"uses": ["node-14.15.5-64bit", "python-3.7.4-2-64bit", "releases-fastcomp-%releases-tag%-64bit"],
744+
"uses": ["node-14.18.2-64bit", "python-3.7.4-2-64bit", "releases-fastcomp-%releases-tag%-64bit"],
696745
"os": "macos",
697746
"arch": "x86_64",
698747
"custom_install_script": "emscripten_npm_install"
699748
},
700749
{
701750
"version": "releases-fastcomp-%releases-tag%",
702751
"bitness": 64,
703-
"uses": ["node-14.15.5-64bit", "python-3.9.2-1-64bit", "releases-fastcomp-%releases-tag%-64bit"],
752+
"uses": ["node-14.18.2-64bit", "python-3.9.2-1-64bit", "releases-fastcomp-%releases-tag%-64bit"],
704753
"os": "macos",
705754
"arch": "aarch64",
706755
"custom_install_script": "emscripten_npm_install"
707756
},
708757
{
709758
"version": "releases-fastcomp-%releases-tag%",
710759
"bitness": 64,
711-
"uses": ["node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"],
760+
"uses": ["node-14.18.2-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"],
712761
"os": "win",
713762
"custom_install_script": "emscripten_npm_install"
714763
},

‎scripts/update_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import os
1717
import shutil
1818

19-
version = '14.15.5'
19+
version = '14.18.2'
2020
base = 'https://nodejs.org/dist/latest-v14.x/'
2121
upload_base = 'gs://webassembly/emscripten-releases-builds/deps/'
2222

‎test/test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ def test_redownload(self):
185185

186186
# Test the normal tools like node don't re-download on re-install
187187
print('another install must re-download')
188-
checked_call_with_output(emsdk + ' uninstall node-14.15.5-64bit')
189-
checked_call_with_output(emsdk + ' install node-14.15.5-64bit', expected='Downloading:', unexpected='already installed')
190-
checked_call_with_output(emsdk + ' install node-14.15.5-64bit', unexpected='Downloading:', expected='already installed')
188+
checked_call_with_output(emsdk + ' uninstall node-14.18.2-64bit')
189+
checked_call_with_output(emsdk + ' install node-14.18.2-64bit', expected='Downloading:', unexpected='already installed')
190+
checked_call_with_output(emsdk + ' install node-14.18.2-64bit', unexpected='Downloading:', expected='already installed')
191191

192192
def test_tot_upstream(self):
193193
print('test update-tags')

0 commit comments

Comments
 (0)