From 7b95a595f344fcd4fa54ff26014a4274fa0f5678 Mon Sep 17 00:00:00 2001 From: Yulong Wang <7679871+fs-eire@users.noreply.github.com> Date: Tue, 25 Feb 2025 23:45:46 -0800 Subject: [PATCH] upgrade emsdk to 4.0.4 --- .gitmodules | 2 +- cmake/external/emsdk | 2 +- tools/ci_build/build.py | 2 +- .../github/azure-pipelines/templates/linux-wasm-ci.yml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 356447cbf7a98..7656fc429d005 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,4 +7,4 @@ [submodule "cmake/external/emsdk"] path = cmake/external/emsdk url = https://github.com/emscripten-core/emsdk.git - branch = 4.0.3 + branch = 4.0.4 diff --git a/cmake/external/emsdk b/cmake/external/emsdk index 127ce42cd5f0a..074211759c17c 160000 --- a/cmake/external/emsdk +++ b/cmake/external/emsdk @@ -1 +1 @@ -Subproject commit 127ce42cd5f0aabe2d9b5d636041ccef7c66d165 +Subproject commit 074211759c17c646164d3271ca1d155cc174f78e diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py index ecdffbe5fd6a0..d172961a70bc7 100644 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py @@ -503,7 +503,7 @@ def convert_arg_line_to_args(self, arg_line): # WebAssembly build parser.add_argument("--build_wasm", action="store_true", help="Build for WebAssembly") parser.add_argument("--build_wasm_static_lib", action="store_true", help="Build for WebAssembly static library") - parser.add_argument("--emsdk_version", default="4.0.3", help="Specify version of emsdk") + parser.add_argument("--emsdk_version", default="4.0.4", help="Specify version of emsdk") parser.add_argument("--enable_wasm_simd", action="store_true", help="Enable WebAssembly SIMD") parser.add_argument("--enable_wasm_threads", action="store_true", help="Enable WebAssembly multi-threads support") diff --git a/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml b/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml index 02dd5faec0fe8..dffcea9500393 100644 --- a/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml @@ -88,15 +88,15 @@ jobs: - script: | set -ex cd '$(Build.SourcesDirectory)/cmake/external/emsdk' - ./emsdk install 4.0.3 ccache-git-emscripten-64bit - ./emsdk activate 4.0.3 ccache-git-emscripten-64bit + ./emsdk install 4.0.4 ccache-git-emscripten-64bit + ./emsdk activate 4.0.4 ccache-git-emscripten-64bit displayName: 'emsdk install and activate ccache for emscripten' - ${{if eq(parameters.WithCache, false)}}: - script: | set -ex cd '$(Build.SourcesDirectory)/cmake/external/emsdk' - ./emsdk install 4.0.3 - ./emsdk activate 4.0.3 + ./emsdk install 4.0.4 + ./emsdk activate 4.0.4 displayName: 'emsdk install and activate ccache for emscripten' - template: build-linux-wasm-step.yml