diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-08-21 08:11:26 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 08:11:26 +0900 |
| commit | 01fb19e1c38e2e7f41f738f7e6b4fb1b0a50a69c (patch) | |
| tree | f7fa4f122d3c983a3940ec756ef3f56649cbcdc8 | |
| parent | ace7ba86e550d5aff89c507830553286b35a9f15 (diff) | |
| parent | 94da11522c24e0a5c1f44966864d5c17c1fade67 (diff) | |
| download | rust-libc-01fb19e1c38e2e7f41f738f7e6b4fb1b0a50a69c.tar.gz | |
Merge pull request #1868 from JohnTitor/emsdk-1.39.20
Update emsdk to 1.39.20
| -rwxr-xr-x | ci/emscripten-entry.sh | 3 | ||||
| -rw-r--r-- | ci/emscripten.sh | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ci/emscripten-entry.sh b/ci/emscripten-entry.sh index 41e7935ff7..ee3261f1b5 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 a24094f67a..ea1083ae0e 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 |