Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade emsdk from 3.1.59 to 3.1.62 #21421

Merged
merged 8 commits into from
Aug 14, 2024
Merged

Upgrade emsdk from 3.1.59 to 3.1.62 #21421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d634004
Upgrade emsdk from 3.1.59 to 3.1.62
satyajandhyala Jul 19, 2024
53595ec
Changed the emsdk submodule to 3.1.62.
satyajandhyala Jul 23, 2024
1e3c765
Merge branch 'main' of github.com:microsoft/onnxruntime into sajandhy…
satyajandhyala Jul 30, 2024
d66e7f5
Try disable accelerated video flag to avoid Chrome crashing.
satyajandhyala Jul 30, 2024
831614b
typo
satyajandhyala Jul 30, 2024
86ca602
Revert "typo"
satyajandhyala Aug 1, 2024
fa53e38
Revert "Try disable accelerated video flag to avoid Chrome crashing."
satyajandhyala Aug 1, 2024
227e7b5
Merge branch 'main' of github.com:microsoft/onnxruntime into sajandhy…
satyajandhyala Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.62
2 changes: 1 addition & 1 deletion cgmanifests/generated/cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"component": {
"type": "git",
"git": {
"commitHash": "d52c46520124845b1e0e0525f2759299d840143f",
"commitHash": "0fde04880048f743056bed17cb0543a42e040fae",
"repositoryUrl": "https://github.com/emscripten-core/emsdk.git"
},
"comments": "git submodule at cmake/external/emsdk"
Expand Down
2 changes: 1 addition & 1 deletion cmake/external/emsdk
Open in desktop
Submodule emsdk updated 27 files
+30 −36 .circleci/config.yml
+1 −1 README.md
+26 −0 bazel/README.md
+1 −0 bazel/emscripten_deps.bzl
+2 −2 bazel/emscripten_toolchain/BUILD.bazel
+0 −0 bazel/emscripten_toolchain/default_config
+6 −5 bazel/emscripten_toolchain/link_wrapper.py
+11 −1 bazel/emscripten_toolchain/toolchain.bzl
+22 −13 bazel/emscripten_toolchain/wasm_cc_binary.bzl
+21 −0 bazel/revisions.bzl
+1 −0 bazel/test_secondary_lto_cache/.bazelrc
+4 −0 bazel/test_secondary_lto_cache/.gitignore
+19 −0 bazel/test_secondary_lto_cache/BUILD
+1 −0 bazel/test_secondary_lto_cache/MODULE.bazel
+30 −0 bazel/test_secondary_lto_cache/WORKSPACE
+6 −0 bazel/test_secondary_lto_cache/hello-world.cc
+95 −1 bazel/toolchains.bzl
+1 −1 docker/Dockerfile
+7 −1 emscripten-releases-tags.json
+1 −8 emsdk
+21 −16 emsdk.py
+55 −7 emsdk_manifest.json
+25 −0 scripts/get_release_info.py
+2 −2 scripts/update_node.py
+6 −0 test/test_bazel.ps1
+7 −6 test/test_bazel.sh
+7 −6 test/test_bazel_mac.sh
2 changes: 1 addition & 1 deletion tools/ci_build/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,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.59", help="Specify version of emsdk")
parser.add_argument("--emsdk_version", default="3.1.62", 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")
Expand Down
8 changes: 4 additions & 4 deletions tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.62 ccache-git-emscripten-64bit
./emsdk activate 3.1.62 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.62
./emsdk activate 3.1.62
displayName: 'emsdk install and activate ccache for emscripten'

- template: build-linux-wasm-step.yml
Expand Down
Loading