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

Revert "Upgrade emsdk from 3.1.59 to 3.1.62" #21817

Merged
merged 1 commit into from
Aug 22, 2024
+8 −8
Merged

Revert "Upgrade emsdk from 3.1.59 to 3.1.62" #21817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.62
branch = 3.1.59
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": "0fde04880048f743056bed17cb0543a42e040fae",
"commitHash": "d52c46520124845b1e0e0525f2759299d840143f",
"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
+36 −30 .circleci/config.yml
+1 −1 README.md
+0 −26 bazel/README.md
+0 −1 bazel/emscripten_deps.bzl
+2 −2 bazel/emscripten_toolchain/BUILD.bazel
+0 −0 bazel/emscripten_toolchain/emscripten_config
+5 −6 bazel/emscripten_toolchain/link_wrapper.py
+1 −11 bazel/emscripten_toolchain/toolchain.bzl
+13 −22 bazel/emscripten_toolchain/wasm_cc_binary.bzl
+0 −21 bazel/revisions.bzl
+0 −1 bazel/test_secondary_lto_cache/.bazelrc
+0 −4 bazel/test_secondary_lto_cache/.gitignore
+0 −19 bazel/test_secondary_lto_cache/BUILD
+0 −1 bazel/test_secondary_lto_cache/MODULE.bazel
+0 −30 bazel/test_secondary_lto_cache/WORKSPACE
+0 −6 bazel/test_secondary_lto_cache/hello-world.cc
+1 −95 bazel/toolchains.bzl
+1 −1 docker/Dockerfile
+1 −7 emscripten-releases-tags.json
+8 −1 emsdk
+16 −21 emsdk.py
+7 −55 emsdk_manifest.json
+0 −25 scripts/get_release_info.py
+2 −2 scripts/update_node.py
+0 −6 test/test_bazel.ps1
+6 −7 test/test_bazel.sh
+6 −7 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.62", help="Specify version of emsdk")
parser.add_argument("--emsdk_version", default="3.1.59", 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.62 ccache-git-emscripten-64bit
./emsdk activate 3.1.62 ccache-git-emscripten-64bit
./emsdk install 3.1.59 ccache-git-emscripten-64bit
./emsdk activate 3.1.59 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.62
./emsdk activate 3.1.62
./emsdk install 3.1.59
./emsdk activate 3.1.59
displayName: 'emsdk install and activate ccache for emscripten'

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