From 94da11522c24e0a5c1f44966864d5c17c1fade67 Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Thu, 20 Aug 2020 12:53:03 +0900
Subject: [PATCH] Update emsdk to 1.39.20
---
ci/emscripten-entry.sh | 3 ++-
ci/emscripten.sh | 7 +++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ci/emscripten-entry.sh b/ci/emscripten-entry.sh
index 41e7935f..ee3261f1 100755
--- a/ci/emscripten-entry.sh
+++ b/ci/emscripten-entry.sh
@@ -6,6 +6,7 @@ set -ex
source /emsdk-portable/emsdk_env.sh &> /dev/null
# emsdk-portable provides a node binary, but we need version 8 to run wasm
-export PATH="/node-v12.16.2-linux-x64/bin:$PATH"
+# NOTE: Do not forget to sync Node.js version with `emscripten.sh`!
+export PATH="/node-v12.18.3-linux-x64/bin:$PATH"
exec "$@"
diff --git a/ci/emscripten.sh b/ci/emscripten.sh
index a24094f6..ea1083ae 100644
--- a/ci/emscripten.sh
+++ b/ci/emscripten.sh
@@ -2,7 +2,7 @@
set -ex
-EMSDK_VERSION=1.39.19
+EMSDK_VERSION=1.39.20
hide_output() {
set +x
@@ -23,8 +23,6 @@ exit 1
git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable
cd /emsdk-portable
-# FIXME: switch to an upstream install once
-# https://github.com/rust-lang/rust/pull/63649 lands
hide_output ./emsdk install "${EMSDK_VERSION}"
./emsdk activate "${EMSDK_VERSION}"
@@ -39,6 +37,7 @@ rm -f a.*
chmod a+rxw -R /emsdk-portable
# node 8 is required to run wasm
+# NOTE: Do not forget to sync Node.js version with `emscripten-entry.sh`!
cd /
-curl --retry 5 -L https://nodejs.org/dist/v12.16.2/node-v12.16.2-linux-x64.tar.xz | \
+curl --retry 5 -L https://nodejs.org/dist/v12.18.3/node-v12.18.3-linux-x64.tar.xz | \
tar -xJ
--
GitLab