Skip to content

Commit

Permalink
Merge pull request #2645 from ericoporto/sync-emscripten-3.1.74
Browse files Browse the repository at this point in the history
Emscripten: update to 3.1.74
  • Loading branch information
ivan-mogilko authored Jan 8, 2025
2 parents f54b966 + b105667 commit 1c93e08
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Emscripten/install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ mkdir emscripten
pushd emscripten
git clone https://github.com/emscripten-core/emsdk.git
pushd emsdk
./emsdk install 3.1.55
./emsdk activate 3.1.55
./emsdk install 3.1.74
./emsdk activate 3.1.74
source ./emsdk_env.sh
popd
popd
Expand Down
4 changes: 2 additions & 2 deletions ci/emscripten/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
FROM ubuntu:jammy

# The current used version of emsdk
ARG EMSCRIPTEN_VERSION=3.1.55
ARG EMSCRIPTEN_VERSION=3.1.74
ENV EMSDK=/emsdk

#fix TZ docker hang
Expand Down Expand Up @@ -91,7 +91,7 @@ RUN echo "## Aggressive optimization: Remove debug symbols" \
# using `--entrypoint /bin/bash` in CLI).
# This corresponds to the env variables set during: `source ./emsdk_env.sh`
ENV EMSDK=/emsdk \
PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/node/16.20.0_64bit/bin:${PATH}"
PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/node/20.18.0_64bit/bin:${PATH}"

# ------------------------------------------------------------------------------
# Create a 'standard` 1000:1000 user
Expand Down

0 comments on commit 1c93e08

Please sign in to comment.