From 8a64704fb5bc211e0780bcdec604133acb90d46c Mon Sep 17 00:00:00 2001 From: Satya Jandhyala Date: Fri, 19 Jul 2024 12:58:19 -0700 Subject: [PATCH] Upgrade to 3.1.63 --- .gitmodules | 2 +- cgmanifests/generated/cgmanifest.json | 2 +- cmake/external/emsdk | 2 +- tools/ci_build/build.py | 2 +- .../github/azure-pipelines/templates/linux-wasm-ci.yml | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 29ca8821f8eb8..0a880bdfff286 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 = 3.1.59 + branch = 3.1.63 diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json index 29eb7045fc299..141f9778bd6ca 100644 --- a/cgmanifests/generated/cgmanifest.json +++ b/cgmanifests/generated/cgmanifest.json @@ -6,7 +6,7 @@ "component": { "type": "git", "git": { - "commitHash": "d52c46520124845b1e0e0525f2759299d840143f", + "commitHash": "772828321afe0761c836bbbad3992ba392b9b708", "repositoryUrl": "https://github.com/emscripten-core/emsdk.git" }, "comments": "git submodule at cmake/external/emsdk" diff --git a/cmake/external/emsdk b/cmake/external/emsdk index 0fde04880048f..772828321afe0 160000 --- a/cmake/external/emsdk +++ b/cmake/external/emsdk @@ -1 +1 @@ -Subproject commit 0fde04880048f743056bed17cb0543a42e040fae +Subproject commit 772828321afe0761c836bbbad3992ba392b9b708 diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py index 74d8ce3241205..c526801c19eb4 100644 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py @@ -467,7 +467,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="3.1.62", help="Specify version of emsdk") + parser.add_argument("--emsdk_version", default="3.1.63", 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 a56eb37faef84..691518d9a86c1 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 @@ -93,15 +93,15 @@ jobs: - script: | set -ex cd '$(Build.SourcesDirectory)/cmake/external/emsdk' - ./emsdk install 3.1.59 ccache-git-emscripten-64bit - ./emsdk activate 3.1.59 ccache-git-emscripten-64bit + ./emsdk install 3.1.63 ccache-git-emscripten-64bit + ./emsdk activate 3.1.63 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 3.1.59 - ./emsdk activate 3.1.59 + ./emsdk install 3.1.63 + ./emsdk activate 3.1.63 displayName: 'emsdk install and activate ccache for emscripten' - template: build-linux-wasm-step.yml