Skip to content

Commit 01fb19e

Browse files
authored
Merge pull request #1868 from JohnTitor/emsdk-1.39.20
Update emsdk to 1.39.20
2 parents ace7ba8 + 94da115 commit 01fb19e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ci/emscripten-entry.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ set -ex
66
source /emsdk-portable/emsdk_env.sh &> /dev/null
77

88
# emsdk-portable provides a node binary, but we need version 8 to run wasm
9-
export PATH="/node-v12.16.2-linux-x64/bin:$PATH"
9+
# NOTE: Do not forget to sync Node.js version with `emscripten.sh`!
10+
export PATH="/node-v12.18.3-linux-x64/bin:$PATH"
1011

1112
exec "$@"

ci/emscripten.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -ex
44

5-
EMSDK_VERSION=1.39.19
5+
EMSDK_VERSION=1.39.20
66

77
hide_output() {
88
set +x
@@ -23,8 +23,6 @@ exit 1
2323

2424
git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable
2525
cd /emsdk-portable
26-
# FIXME: switch to an upstream install once
27-
# https://github.com/rust-lang/rust/pull/63649 lands
2826
hide_output ./emsdk install "${EMSDK_VERSION}"
2927
./emsdk activate "${EMSDK_VERSION}"
3028

@@ -39,6 +37,7 @@ rm -f a.*
3937
chmod a+rxw -R /emsdk-portable
4038

4139
# node 8 is required to run wasm
40+
# NOTE: Do not forget to sync Node.js version with `emscripten-entry.sh`!
4241
cd /
43-
curl --retry 5 -L https://nodejs.org/dist/v12.16.2/node-v12.16.2-linux-x64.tar.xz | \
42+
curl --retry 5 -L https://nodejs.org/dist/v12.18.3/node-v12.18.3-linux-x64.tar.xz | \
4443
tar -xJ

0 commit comments

Comments
 (0)