Try to update emsdk version

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
rust-lang · Sep 24, 2022 · 286c06c · 286c06c
1 parent 1f1527e
commit 286c06c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/ci/docker/asmjs-unknown-emscripten/Dockerfile b/ci/docker/asmjs-unknown-emscripten/Dockerfile
@@ -15,7 +15,8 @@ RUN apt-get install -y --no-install-recommends \
     libxml2 \
     python3 \
     python3-distutils \
-    xz-utils
+    xz-utils \
+    bzip2
 
 COPY emscripten.sh /
 RUN bash /emscripten.sh

diff --git a/ci/docker/wasm32-unknown-emscripten/Dockerfile b/ci/docker/wasm32-unknown-emscripten/Dockerfile
@@ -21,7 +21,8 @@ RUN apt-get install -y --no-install-recommends \
     cmake \
     sudo \
     gdb \
-    xz-utils
+    xz-utils \
+    bzip2
 
 RUN ln -s /usr/bin/python3 /usr/bin/python & \
     ln -s /usr/bin/pip3 /usr/bin/pip

diff --git a/ci/emscripten.sh b/ci/emscripten.sh
@@ -2,28 +2,11 @@
 
 set -ex
 
-EMSDK_VERSION=1.39.20
-
-hide_output() {
-  set +x
-  on_err="
-echo ERROR: An error was encountered with the build.
-cat /tmp/build.log
-exit 1
-"
-  trap '$on_err' ERR
-  bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
-  PING_LOOP_PID=$!
-  "${@}" &> /tmp/build.log
-  trap - ERR
-  kill $PING_LOOP_PID
-  rm -f /tmp/build.log
-  set -x
-}
+EMSDK_VERSION=3.1.23
 
 git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable
 cd /emsdk-portable
-hide_output ./emsdk install "${EMSDK_VERSION}"
+./emsdk install "${EMSDK_VERSION}"
 ./emsdk activate "${EMSDK_VERSION}"
 
 # Compile and cache libc