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

[wasi] Bump wasi sdk to 21. #98340

Merged
merged 1 commit into from
Feb 13, 2024
Merged

[wasi] Bump wasi sdk to 21. #98340

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 eng/pipelines/common/templates/pipeline-with-resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ resources:
ROOTFS_DIR: /crossrootfs/x64

- container: wasi_wasm
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly-20230917141449-2aaa02c
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly-20240212214902-ca89d22
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The infra people prefer to have images use the floating tag instead of using a pinned version: #98357

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The pinned versions were added because the unpinned versions were randomly breaking the build:
#92232

env:
ROOTFS_DIR: /crossrootfs/x64

Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/tools/offsets-tool/offsets-tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def require_emscipten_path (args):

if "wasm" in args.abi:
if args.wasi_path != None:
self.sys_includes = [args.wasi_path + "/share/wasi-sysroot/include", args.wasi_path + "/lib/clang/16/include", args.mono_path + "/wasi/mono-include"]
self.sys_includes = [args.wasi_path + "/share/wasi-sysroot/include", args.wasi_path + "/lib/clang/17/include", args.mono_path + "/wasi/mono-include"]
self.target = Target ("TARGET_WASI", None, ["TARGET_WASM"] + WASI_DEFINES)
self.target_args += ["-target", args.abi]
else:
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasi/wasi-sdk-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
21
Loading