Skip to content

Commit

Permalink
Upgrade node from v16.20.0 to v18.20.3
Browse files Browse the repository at this point in the history
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
  • Loading branch information
sbc100 committed May 22, 2024
1 parent ce74ca2 commit 3427d61
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 14 deletions.
19 changes: 7 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ orbs:
win: circleci/[email protected]

executors:
bionic:
focal:
docker:
- image: buildpack-deps:bionic
- image: buildpack-deps:focal
mac:
environment:
EMSDK_NOTTY: "1"
Expand Down Expand Up @@ -50,7 +50,7 @@ commands:
jobs:
flake8:
executor: bionic
executor: focal
steps:
- checkout
- run:
Expand All @@ -65,14 +65,9 @@ jobs:
- run: python2 -m flake8 --show-source --statistics --extend-exclude=./scripts
- run: python3 -m flake8 --show-source --statistics
test-linux:
executor: bionic
executor: focal
environment:
EMSDK_NOTTY: "1"
# This is needed because the old gcc-7 that is installed on debian/bionic
# generates warnings about unused variables when doing C++17
# destructuring:
# https://github.com/WebAssembly/binaryen/issues/4353
CXXFLAGS: "-Wno-unused-variable"
# I don't know why circleci VMs pretent to have 36 cores but its a lie.
EMSDK_NUM_CORES: "4"
steps:
Expand Down Expand Up @@ -174,7 +169,7 @@ jobs:
test/test_path_preservation.ps1
build-docker-image-x64:
executor: bionic
executor: focal
steps:
- checkout
- run:
Expand All @@ -190,7 +185,7 @@ jobs:
command: make -C ./docker version=latest test

publish-docker-image-x64:
executor: bionic
executor: focal
steps:
- checkout
- run:
Expand Down Expand Up @@ -226,7 +221,7 @@ jobs:
make -C ./docker version=${CIRCLE_TAG} alias=${CIRCLE_TAG}-arm64 only_alias=true push
test-bazel-linux:
executor: bionic
executor: focal
steps:
- checkout
- run: apt-get install -q -y curl gnupg
Expand Down
48 changes: 48 additions & 0 deletions emsdk_manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,54 @@
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
},

{
"id": "node",
"version": "18.20.3",
"bitness": 32,
"arch": "x86",
"windows_url": "node-v18.20.3-win-x86.zip",
"activated_path": "%installation_dir%/bin",
"activated_path_skip": "node",
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
},
{
"id": "node",
"version": "18.20.3",
"arch": "arm",
"bitness": 32,
"linux_url": "node-v18.20.3-linux-armv7l.tar.xz",
"activated_path": "%installation_dir%/bin",
"activated_path_skip": "node",
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
},
{
"id": "node",
"version": "18.20.3",
"bitness": 64,
"arch": "x86_64",
"macos_url": "node-v18.20.3-darwin-x64.tar.gz",
"windows_url": "node-v18.20.3-win-x64.zip",
"linux_url": "node-v18.20.3-linux-x64.tar.xz",
"activated_path": "%installation_dir%/bin",
"activated_path_skip": "node",
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
},
{
"id": "node",
"version": "18.20.3",
"arch": "arm64",
"bitness": 64,
"macos_url": "node-v18.20.3-darwin-arm64.tar.gz",
"linux_url": "node-v18.20.3-linux-arm64.tar.xz",
"activated_path": "%installation_dir%/bin",
"activated_path_skip": "node",
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
},


{
"id": "python",
Expand Down
4 changes: 2 additions & 2 deletions scripts/update_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import os
import shutil

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

suffixes = [
Expand Down

0 comments on commit 3427d61

Please sign in to comment.