Skip to content

Commit b08e7fa

Browse files
richlanderCopilot
andauthored
[release/9.0] Update WebAssembly Helix image versions (#126527)
> [!NOTE] > This PR was AI/Copilot-generated. Update the release/9.0 WASI and Browser WebAssembly Helix queue image references to the published Ubuntu 26.04 WebAssembly image. - `libraries/helix-queues-setup.yml`: move WASI, Browser WASM, and Browser WASM Firefox to `ubuntu-26.04-helix-webassembly-amd64` - `coreclr/templates/helix-queues-setup.yml`: move Browser WASM to the 26.04 amd64 image while preserving the existing host queue pattern on this branch - exact tag validated in `image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json` Backport of #126524. Ref #125690, #126122 --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 1520851 commit b08e7fa

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

docs/workflow/building/coreclr/cross-building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ docker run --rm \
155155
-v <RUNTIME_REPO_PATH>:/runtime \
156156
-w /runtime \
157157
-e ROOTFS_DIR=/crossrootfs/arm64 \
158-
mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64 \
158+
mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm64 \
159159
./build.sh --subset clr --cross --arch arm64
160160
```
161161

eng/pipelines/coreclr/templates/helix-queues-setup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
# Browser wasm
5252
- ${{ if eq(parameters.platform, 'browser_wasm') }}:
53-
- (Ubuntu.2204.Amd64)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-webassembly
53+
- (Ubuntu.2604.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-26.04-helix-webassembly-amd64
5454

5555
# iOS devices
5656
- ${{ if in(parameters.platform, 'ios_arm64') }}:

eng/pipelines/libraries/helix-queues-setup.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ jobs:
5858
# CoreCLR path
5959
- ${{ if and(eq(parameters.jobParameters.isExtraPlatformsBuild, true), ne(parameters.jobParameters.testScope, 'outerloop'))}}:
6060
# extra-platforms CoreCLR (inner loop only)
61+
- AzureLinux.3.Amd64.Open
6162
- (Debian.12.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64
62-
- (Mariner.2.0.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64
6363

6464
- ${{ if eq(parameters.jobParameters.testScope, 'outerloop') }}:
6565
# outerloop only CoreCLR
@@ -68,7 +68,7 @@ jobs:
6868
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true))}}:
6969
# inner and outer loop CoreCLR (general set)
7070
- Ubuntu.2204.Amd64.Open
71-
- (AzureLinux.3.0.Amd64.Open)AzureLinux.3.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64
71+
- (AzureLinux.3.0.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64
7272
- (Centos.10.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-helix-amd64
7373

7474
# OSX arm64
@@ -152,15 +152,15 @@ jobs:
152152

153153
# WASI
154154
- ${{ if eq(parameters.platform, 'wasi_wasm') }}:
155-
- (Ubuntu.2204.Amd64)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-webassembly
155+
- (Ubuntu.2604.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-26.04-helix-webassembly-amd64
156156

157157
# Browser WebAssembly
158158
- ${{ if eq(parameters.platform, 'browser_wasm') }}:
159-
- (Ubuntu.2204.Amd64)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-webassembly
159+
- (Ubuntu.2604.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-26.04-helix-webassembly-amd64
160160

161161
# Browser WebAssembly Firefox
162162
- ${{ if eq(parameters.platform, 'browser_wasm_firefox') }}:
163-
- (Ubuntu.2204.Amd64)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-webassembly
163+
- (Ubuntu.2604.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-26.04-helix-webassembly-amd64
164164

165165
# Browser WebAssembly windows
166166
- ${{ if in(parameters.platform, 'browser_wasm_win', 'wasi_wasm_win') }}:

0 commit comments

Comments
 (0)