From 81a70a8f84c79bc084aad0f543975563f56ef738 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 10 May 2024 10:56:36 +0200 Subject: [PATCH 1/2] [wasm] Use the plain cbl-mariner-2.0 images The emscripten should be provisioned from nuget packages --- eng/pipelines/common/templates/pipeline-with-resources.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml index bedb0ff5121a4a..e901eded9ba65b 100644 --- a/eng/pipelines/common/templates/pipeline-with-resources.yml +++ b/eng/pipelines/common/templates/pipeline-with-resources.yml @@ -100,7 +100,7 @@ extends: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 browser_wasm: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0 env: ROOTFS_DIR: /crossrootfs/x64 From 161160fa8ade8ff20b2b511833677c144db1b146 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 10 May 2024 12:12:56 +0200 Subject: [PATCH 2/2] Use image with newer clang --- eng/pipelines/common/templates/pipeline-with-resources.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml index e901eded9ba65b..e15002ebf217c7 100644 --- a/eng/pipelines/common/templates/pipeline-with-resources.yml +++ b/eng/pipelines/common/templates/pipeline-with-resources.yml @@ -100,7 +100,7 @@ extends: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 browser_wasm: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64 env: ROOTFS_DIR: /crossrootfs/x64