Skip to content

[wasm] Bump emscripten to 3.1.30 #310

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

Merged
merged 5 commits into from
Feb 8, 2023
Merged

[wasm] Bump emscripten to 3.1.30 #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f2350a2
[wasm] Bump emscripten to 3.1.30
radekdoulik Jan 29, 2023
fc1c36b
Set right image for threading build
radekdoulik Jan 30, 2023
70fcf98
Use newer images for wasi as well
radekdoulik Jan 30, 2023
4469430
Merge remote-tracking branch 'remotes/origin/dotnet/main' into dotnet…
radekdoulik Jan 30, 2023
dc03925
Merge branch 'dotnet/main' into pr-wasm-emscripten-3-1-30
radekdoulik Feb 8, 2023
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 .devcontainer/emscripten-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.12
3.1.30
8 changes: 4 additions & 4 deletions eng/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ stages:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
container:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly-20220531132048-00a561c
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly3130-20230130145247-f7eb839
Copy link
Member

@akoeplinger akoeplinger Jan 30, 2023

Choose a reason for hiding this comment

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

we're supposed to be using the "latest" docker tags, so just

Suggested change
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly3130-20230130145247-f7eb839
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly3130

Copy link
Member Author

@radekdoulik radekdoulik Jan 30, 2023

Choose a reason for hiding this comment

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

this is temporary, so that we could prepare dotnet/runtime PR. once we have everything ready, it will use the ubuntu-18.04-webassembly image

Copy link
Member

@akoeplinger akoeplinger Jan 30, 2023

Choose a reason for hiding this comment

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

We'll probably need to keep different images in the future anyway since we're not planning on bumping emscripten in e.g. release/7.0 and the goal is to move to these "latest" tags everywhere

Copy link
Member Author

@radekdoulik radekdoulik Jan 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

We might make our mind meanwhile then and discuss what would work best and change it when the rest of our changes are ready. For now I would like to use these. The ubuntu-18.04-webassembly3130 image has only datetime tags right now, we can add floating tags later if needed.

When I chose the webassembly3130 name, I thought about it as temporary. If we want to introduce separate images, then something like webassembly-net8 might work better? The emscripten 3.1.30 might not be the final version yet.

Copy link
Member

@akoeplinger akoeplinger Jan 31, 2023

Choose a reason for hiding this comment

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

Yup webassembly-net8 sounds better, I agree. The floating tag should be created automatically AFAIK (maybe only once there was a "production" rollout once a week).

Copy link
Member Author

@radekdoulik radekdoulik Jan 31, 2023

Choose a reason for hiding this comment

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

It is specified in the manifest, which tags are created. So ubuntu-18.04-webassembly has the floating tags https://github.com/dotnet/dotnet-buildtools-prereqs-docker/blob/main/src/ubuntu/manifest.json#L447-L448, while ubuntu-18.04-webassembly3130 has not https://github.com/dotnet/dotnet-buildtools-prereqs-docker/blob/main/src/ubuntu/manifest.json#L460.

Copy link
Member

@akoeplinger akoeplinger Jan 31, 2023

Choose a reason for hiding this comment

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

ah interesting, thanks

steps:
- bash: |
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=Browser /p:TargetArchitecture=wasm $(_InternalBuildArgs)
Expand All @@ -65,7 +65,7 @@ stages:
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
container:
# when updating, change emscripten version here: ../.devcontainer/emscripten-version.txt
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly-20220531132048-00a561c
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly3130-20230130145247-f7eb839
steps:
- bash: |
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:WasmEnableThreads=true $(_InternalBuildArgs)
Expand All @@ -88,7 +88,7 @@ stages:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
container:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-webassembly
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-webassembly3130-20230130145338-66f9fdd
steps:
- bash: |
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=Wasi /p:TargetArchitecture=wasm $(_InternalBuildArgs)
Expand All @@ -110,7 +110,7 @@ stages:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
container:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-webassembly
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-webassembly3130-20230130145338-66f9fdd
steps:
- bash: |
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=Wasi /p:TargetArchitecture=wasm /p:WasmEnableThreads=true $(_InternalBuildArgs)
Expand Down
Loading