Skip to content

Commit ba7baae

Browse files
authored
Revert "Upgrade emsdk from 3.1.59 to 3.1.62" (microsoft#21817)
Reverts microsoft#21421 Users are seeing chrome memory grow to 16GB before it crashes: microsoft#21810 Revert for now so we have time to debug.
1 parent 514b469 commit ba7baae

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
[submodule "cmake/external/emsdk"]
88
path = cmake/external/emsdk
99
url = https://github.com/emscripten-core/emsdk.git
10-
branch = 3.1.62
10+
branch = 3.1.59

cgmanifests/generated/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"component": {
77
"type": "git",
88
"git": {
9-
"commitHash": "0fde04880048f743056bed17cb0543a42e040fae",
9+
"commitHash": "d52c46520124845b1e0e0525f2759299d840143f",
1010
"repositoryUrl": "https://github.com/emscripten-core/emsdk.git"
1111
},
1212
"comments": "git submodule at cmake/external/emsdk"

tools/ci_build/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ def convert_arg_line_to_args(self, arg_line):
464464
# WebAssembly build
465465
parser.add_argument("--build_wasm", action="store_true", help="Build for WebAssembly")
466466
parser.add_argument("--build_wasm_static_lib", action="store_true", help="Build for WebAssembly static library")
467-
parser.add_argument("--emsdk_version", default="3.1.62", help="Specify version of emsdk")
467+
parser.add_argument("--emsdk_version", default="3.1.59", help="Specify version of emsdk")
468468

469469
parser.add_argument("--enable_wasm_simd", action="store_true", help="Enable WebAssembly SIMD")
470470
parser.add_argument("--enable_wasm_threads", action="store_true", help="Enable WebAssembly multi-threads support")

tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ jobs:
9393
- script: |
9494
set -ex
9595
cd '$(Build.SourcesDirectory)/cmake/external/emsdk'
96-
./emsdk install 3.1.62 ccache-git-emscripten-64bit
97-
./emsdk activate 3.1.62 ccache-git-emscripten-64bit
96+
./emsdk install 3.1.59 ccache-git-emscripten-64bit
97+
./emsdk activate 3.1.59 ccache-git-emscripten-64bit
9898
displayName: 'emsdk install and activate ccache for emscripten'
9999
- ${{if eq(parameters.WithCache, false)}}:
100100
- script: |
101101
set -ex
102102
cd '$(Build.SourcesDirectory)/cmake/external/emsdk'
103-
./emsdk install 3.1.62
104-
./emsdk activate 3.1.62
103+
./emsdk install 3.1.59
104+
./emsdk activate 3.1.59
105105
displayName: 'emsdk install and activate ccache for emscripten'
106106
107107
- template: build-linux-wasm-step.yml

0 commit comments

Comments
 (0)