Skip to content

Commit 37c0b84

Browse files
sbc100sbc100
committed
Update node version 14.15.5 -> 15.14.0
This is the current v15 release and updating for v15 or above will allow is to disable and possibly completely remove the `NODEJS_CATCH_REJECTION` setting in emscripten. This setting is a workaround for the fact the older node version will return exit with 0 on unhandled promise rejection. The downside to updating the version used by emsdk and therefore the version against which we do all our emscripten testing is that we potentially loose some coverage of compatability with older versions. In practice I don't think we have seen a node compat issue in many years. The limits on the JS output produced by emscripten are all related to targeting older browsers which tend to be a lot older than any of the node versions we want to target.
1 parent f44b841 commit 37c0b84

File tree

4 files changed

+29
-28
lines changed

4 files changed

+29
-28
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/15.14.0_64bit/bin/node \
69+
PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/upstream/bin:/emsdk/node/15.14.0_64bit/bin:${PATH}"
7070

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

‎emsdk_manifest.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -202,43 +202,43 @@
202202
},
203203
{
204204
"id": "node",
205-
"version": "14.15.5",
205+
"version": "15.14.0",
206206
"bitness": 32,
207207
"arch": "x86",
208-
"windows_url": "node-v14.15.5-win-x86.zip",
208+
"windows_url": "node-v15.14.0-win-x86.zip",
209209
"activated_path": "%installation_dir%/bin",
210210
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
211211
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
212212
},
213213
{
214214
"id": "node",
215-
"version": "14.15.5",
215+
"version": "15.14.0",
216216
"arch": "arm",
217217
"bitness": 32,
218-
"linux_url": "node-v14.15.5-linux-armv7l.tar.xz",
218+
"linux_url": "node-v15.14.0-linux-armv7l.tar.xz",
219219
"activated_path": "%installation_dir%/bin",
220220
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
221221
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
222222
},
223223
{
224224
"id": "node",
225-
"version": "14.15.5",
225+
"version": "15.14.0",
226226
"bitness": 64,
227227
"arch": "x86_64",
228-
"macos_url": "node-v14.15.5-darwin-x64.tar.gz",
229-
"windows_url": "node-v14.15.5-win-x64.zip",
230-
"linux_url": "node-v14.15.5-linux-x64.tar.xz",
228+
"macos_url": "node-v15.14.0-darwin-x64.tar.gz",
229+
"windows_url": "node-v15.14.0-win-x64.zip",
230+
"linux_url": "node-v15.14.0-linux-x64.tar.xz",
231231
"activated_path": "%installation_dir%/bin",
232232
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
233233
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
234234
},
235235
{
236236
"id": "node",
237-
"version": "14.15.5",
237+
"version": "15.14.0",
238238
"arch": "aarch64",
239239
"bitness": 64,
240-
"macos_url": "node-v14.15.5-darwin-x64.tar.gz",
241-
"linux_url": "node-v14.15.5-linux-arm64.tar.xz",
240+
"macos_url": "node-v15.14.0-darwin-x64.tar.gz",
241+
"linux_url": "node-v15.14.0-linux-arm64.tar.xz",
242242
"activated_path": "%installation_dir%/bin",
243243
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
244244
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
@@ -537,19 +537,19 @@
537537
{
538538
"version": "upstream-main",
539539
"bitness": 64,
540-
"uses": ["python-3.9.2-1-64bit", "llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
540+
"uses": ["python-3.9.2-1-64bit", "llvm-git-main-64bit", "node-15.14.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
541541
"os": "win"
542542
},
543543
{
544544
"version": "upstream-main",
545545
"bitness": 64,
546-
"uses": ["python-3.9.2-1-64bit", "llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
546+
"uses": ["python-3.9.2-1-64bit", "llvm-git-main-64bit", "node-15.14.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
547547
"os": "macos"
548548
},
549549
{
550550
"version": "upstream-main",
551551
"bitness": 64,
552-
"uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
552+
"uses": ["llvm-git-main-64bit", "node-15.14.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
553553
"os": "linux"
554554
},
555555
{
@@ -597,52 +597,52 @@
597597
{
598598
"version": "releases-upstream-%releases-tag%",
599599
"bitness": 64,
600-
"uses": ["node-14.15.5-64bit", "releases-upstream-%releases-tag%-64bit"],
600+
"uses": ["node-15.14.0-64bit", "releases-upstream-%releases-tag%-64bit"],
601601
"os": "linux",
602602
"custom_install_script": "emscripten_npm_install"
603603
},
604604
{
605605
"version": "releases-upstream-%releases-tag%",
606606
"bitness": 64,
607-
"uses": ["node-14.15.5-64bit", "python-3.9.2-1-64bit", "releases-upstream-%releases-tag%-64bit"],
607+
"uses": ["node-15.14.0-64bit", "python-3.9.2-1-64bit", "releases-upstream-%releases-tag%-64bit"],
608608
"os": "macos",
609609
"arch": "x86_64",
610610
"custom_install_script": "emscripten_npm_install"
611611
},
612612
{
613613
"version": "releases-upstream-%releases-tag%",
614614
"bitness": 64,
615-
"uses": ["node-14.15.5-64bit", "python-3.9.2-1-64bit", "releases-upstream-%releases-tag%-64bit"],
615+
"uses": ["node-15.14.0-64bit", "python-3.9.2-1-64bit", "releases-upstream-%releases-tag%-64bit"],
616616
"os": "macos",
617617
"arch": "aarch64",
618618
"custom_install_script": "emscripten_npm_install"
619619
},
620620
{
621621
"version": "releases-upstream-%releases-tag%",
622622
"bitness": 64,
623-
"uses": ["node-14.15.5-64bit", "python-3.9.2-1-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
623+
"uses": ["node-15.14.0-64bit", "python-3.9.2-1-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
624624
"os": "win",
625625
"custom_install_script": "emscripten_npm_install"
626626
},
627627
{
628628
"version": "releases-fastcomp-%releases-tag%",
629629
"bitness": 64,
630-
"uses": ["node-14.15.5-64bit", "releases-fastcomp-%releases-tag%-64bit"],
630+
"uses": ["node-15.14.0-64bit", "releases-fastcomp-%releases-tag%-64bit"],
631631
"os": "linux",
632632
"custom_install_script": "emscripten_npm_install"
633633
},
634634
{
635635
"version": "releases-fastcomp-%releases-tag%",
636636
"bitness": 64,
637-
"uses": ["node-14.15.5-64bit", "python-3.7.4-2-64bit", "releases-fastcomp-%releases-tag%-64bit"],
637+
"uses": ["node-15.14.0-64bit", "python-3.7.4-2-64bit", "releases-fastcomp-%releases-tag%-64bit"],
638638
"os": "macos",
639639
"arch": "x86_64",
640640
"custom_install_script": "emscripten_npm_install"
641641
},
642642
{
643643
"version": "releases-fastcomp-%releases-tag%",
644644
"bitness": 64,
645-
"uses": ["node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"],
645+
"uses": ["node-15.14.0-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"],
646646
"os": "win",
647647
"custom_install_script": "emscripten_npm_install"
648648
},

‎scripts/update_node.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
import os
1717
import shutil
1818

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

2323
suffixes = [
24+
'-win-x86.zip',
2425
'-win-x64.zip',
2526
'-darwin-x64.tar.gz',
2627
'-linux-x64.tar.xz',

‎test/test.py

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

182182
# Test the normal tools like node don't re-download on re-install
183183
print('another install must re-download')
184-
checked_call_with_output(emsdk + ' uninstall node-14.15.5-64bit')
185-
checked_call_with_output(emsdk + ' install node-14.15.5-64bit', expected='Downloading:', unexpected='already installed')
186-
checked_call_with_output(emsdk + ' install node-14.15.5-64bit', unexpected='Downloading:', expected='already installed')
184+
checked_call_with_output(emsdk + ' uninstall node-15.14.0-64bit')
185+
checked_call_with_output(emsdk + ' install node-15.14.0-64bit', expected='Downloading:', unexpected='already installed')
186+
checked_call_with_output(emsdk + ' install node-15.14.0-64bit', unexpected='Downloading:', expected='already installed')
187187

188188
def test_tot_upstream(self):
189189
print('test update-tags')

0 commit comments

Comments
 (0)