Skip to content

Commit c080151

Browse files
dschuffdschuff
authored
Update nodejs to v12.18.1 (#529)
It includes an update to v8 7.8
1 parent dc74092 commit c080151

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

‎emsdk_manifest.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -188,42 +188,42 @@
188188
},
189189
{
190190
"id": "node",
191-
"version": "12.9.1",
191+
"version": "12.18.1",
192192
"bitness": 32,
193193
"arch": "x86",
194-
"windows_url": "node-v12.9.1-win-x86.zip",
194+
"windows_url": "node-v12.18.1-win-x86.zip",
195195
"activated_path": "%installation_dir%/bin",
196196
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
197197
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
198198
},
199199
{
200200
"id": "node",
201-
"version": "12.9.1",
201+
"version": "12.18.1",
202202
"arch": "arm",
203203
"bitness": 32,
204-
"linux_url": "node-v12.9.1-linux-armv7l.tar.xz",
204+
"linux_url": "node-v12.18.1-linux-armv7l.tar.xz",
205205
"activated_path": "%installation_dir%/bin",
206206
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
207207
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
208208
},
209209
{
210210
"id": "node",
211-
"version": "12.9.1",
211+
"version": "12.18.1",
212212
"bitness": 64,
213213
"arch": "x86_64",
214-
"osx_url": "node-v12.9.1-darwin-x64.tar.gz",
215-
"windows_url": "node-v12.9.1-win-x64.zip",
216-
"linux_url": "node-v12.9.1-linux-x64.tar.xz",
214+
"osx_url": "node-v12.18.1-darwin-x64.tar.gz",
215+
"windows_url": "node-v12.18.1-win-x64.zip",
216+
"linux_url": "node-v12.18.1-linux-x64.tar.xz",
217217
"activated_path": "%installation_dir%/bin",
218218
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
219219
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
220220
},
221221
{
222222
"id": "node",
223-
"version": "12.9.1",
223+
"version": "12.18.1",
224224
"arch": "aarch64",
225225
"bitness": 64,
226-
"linux_url": "node-v12.9.1-linux-arm64.tar.xz",
226+
"linux_url": "node-v12.18.1-linux-arm64.tar.xz",
227227
"activated_path": "%installation_dir%/bin",
228228
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
229229
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
@@ -469,19 +469,19 @@
469469
{
470470
"version": "upstream-master",
471471
"bitness": 64,
472-
"uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
472+
"uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
473473
"os": "win"
474474
},
475475
{
476476
"version": "upstream-master",
477477
"bitness": 64,
478-
"uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
478+
"uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
479479
"os": "osx"
480480
},
481481
{
482482
"version": "upstream-master",
483483
"bitness": 64,
484-
"uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
484+
"uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
485485
"os": "linux"
486486
},
487487
{
@@ -493,31 +493,31 @@
493493
{
494494
"version": "fastcomp-master",
495495
"bitness": 32,
496-
"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"],
496+
"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"],
497497
"os": "win"
498498
},
499499
{
500500
"version": "fastcomp-master",
501501
"bitness": 64,
502-
"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"],
502+
"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"],
503503
"os": "win"
504504
},
505505
{
506506
"version": "fastcomp-master",
507507
"bitness": 64,
508-
"uses": ["fastcomp-clang-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
508+
"uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
509509
"os": "osx"
510510
},
511511
{
512512
"version": "fastcomp-master",
513513
"bitness": 32,
514-
"uses": ["fastcomp-clang-master-32bit", "node-12.9.1-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
514+
"uses": ["fastcomp-clang-master-32bit", "node-12.18.1-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
515515
"os": "linux"
516516
},
517517
{
518518
"version": "fastcomp-master",
519519
"bitness": 64,
520-
"uses": ["fastcomp-clang-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
520+
"uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
521521
"os": "linux"
522522
},
523523
{
@@ -559,42 +559,42 @@
559559
{
560560
"version": "releases-upstream-%releases-tag%",
561561
"bitness": 64,
562-
"uses": ["node-12.9.1-64bit", "releases-upstream-%releases-tag%-64bit"],
562+
"uses": ["node-12.18.1-64bit", "releases-upstream-%releases-tag%-64bit"],
563563
"os": "linux",
564564
"custom_install_script": "emscripten_npm_install"
565565
},
566566
{
567567
"version": "releases-upstream-%releases-tag%",
568568
"bitness": 64,
569-
"uses": ["node-12.9.1-64bit", "releases-upstream-%releases-tag%-64bit"],
569+
"uses": ["node-12.18.1-64bit", "releases-upstream-%releases-tag%-64bit"],
570570
"os": "osx",
571571
"custom_install_script": "emscripten_npm_install"
572572
},
573573
{
574574
"version": "releases-upstream-%releases-tag%",
575575
"bitness": 64,
576-
"uses": ["node-12.9.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
576+
"uses": ["node-12.18.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
577577
"os": "win",
578578
"custom_install_script": "emscripten_npm_install"
579579
},
580580
{
581581
"version": "releases-fastcomp-%releases-tag%",
582582
"bitness": 64,
583-
"uses": ["node-12.9.1-64bit", "releases-fastcomp-%releases-tag%-64bit"],
583+
"uses": ["node-12.18.1-64bit", "releases-fastcomp-%releases-tag%-64bit"],
584584
"os": "linux",
585585
"custom_install_script": "emscripten_npm_install"
586586
},
587587
{
588588
"version": "releases-fastcomp-%releases-tag%",
589589
"bitness": 64,
590-
"uses": ["node-12.9.1-64bit", "releases-fastcomp-%releases-tag%-64bit"],
590+
"uses": ["node-12.18.1-64bit", "releases-fastcomp-%releases-tag%-64bit"],
591591
"os": "osx",
592592
"custom_install_script": "emscripten_npm_install"
593593
},
594594
{
595595
"version": "releases-fastcomp-%releases-tag%",
596596
"bitness": 64,
597-
"uses": ["node-12.9.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"],
597+
"uses": ["node-12.18.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"],
598598
"os": "win",
599599
"custom_install_script": "emscripten_npm_install"
600600
},

‎scripts/test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ def run_emsdk(cmd):
157157

158158
# Test the normal tools like node don't re-download on re-install
159159
print('another install must re-download')
160-
checked_call_with_output(emsdk + ' uninstall node-12.9.1-64bit')
161-
checked_call_with_output(emsdk + ' install node-12.9.1-64bit', expected='Downloading:', unexpected='already installed')
162-
checked_call_with_output(emsdk + ' install node-12.9.1-64bit', unexpected='Downloading:', expected='already installed')
160+
checked_call_with_output(emsdk + ' uninstall node-12.18.1-64bit')
161+
checked_call_with_output(emsdk + ' install node-12.18.1-64bit', expected='Downloading:', unexpected='already installed')
162+
checked_call_with_output(emsdk + ' install node-12.18.1-64bit', unexpected='Downloading:', expected='already installed')
163163

164164
print('test tot-upstream')
165165
run_emsdk('install tot-upstream')

‎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 = '12.16.3'
19+
version = '12.18.1'
2020
base = 'https://nodejs.org/dist/latest-v12.x/'
2121
upload_base = 'gs://webassembly/emscripten-releases-builds/deps/'
2222

0 commit comments

Comments
 (0)