From 725f3f7f2b7da6f71fb4254445bc300ba7681025 Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Fri, 18 Jun 2021 11:04:18 +0000 Subject: [PATCH] Pin emscripten/emsdk Docker version Fixes issues caused by incompatible changes in Emscripten since the time that tree-sitter was built. --- cli/src/wasm.rs | 2 +- script/build-wasm | 10 +++++----- script/fetch-emscripten | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/src/wasm.rs b/cli/src/wasm.rs index 1abbb042..c93eb246 100644 --- a/cli/src/wasm.rs +++ b/cli/src/wasm.rs @@ -61,7 +61,7 @@ pub fn compile_language_to_wasm(language_dir: &Path, force_docker: bool) -> Resu } // Run `emcc` in a container using the `emscripten-slim` image - command.args(&["emscripten/emsdk", "emcc"]); + command.args(&["emscripten/emsdk:2.0.11", "emcc"]); } else { return Err(anyhow!( "You must have either emcc or docker on your PATH to run this command" diff --git a/script/build-wasm b/script/build-wasm index 1b5e48ec..d33dd4b5 100755 --- a/script/build-wasm +++ b/script/build-wasm @@ -63,11 +63,11 @@ emcc= if which emcc > /dev/null && [[ "$force_docker" == "0" ]]; then emcc=emcc elif which docker > /dev/null; then - emcc="docker run \ - --rm \ - -v $(pwd):/src:Z \ - -u $(id -u) \ - emscripten/emsdk \ + emcc="docker run \ + --rm \ + -v $(pwd):/src:Z \ + -u $(id -u) \ + emscripten/emsdk:2.0.11 \ emcc" else echo 'You must have either `docker` or `emcc` on your PATH to run this script' diff --git a/script/fetch-emscripten b/script/fetch-emscripten index c1b072ad..e2817ad8 100755 --- a/script/fetch-emscripten +++ b/script/fetch-emscripten @@ -2,7 +2,7 @@ set -e -EMSCRIPTEN_VERSION=2.0.9 +EMSCRIPTEN_VERSION=2.0.11 mkdir -p target EMSDK_DIR="./target/emsdk"