From 24c8ce7000cc1181412354eb111e9a5c658bd660 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 24 Apr 2024 18:21:45 +0000 Subject: [PATCH] Merged PR 39205: ci and pr build: Update linux musl arm image to 'cbl-mariner-2.0-cross-arm-al... ci and pr build: Update linux musl arm image to 'cbl-mariner-2.0-cross-arm-alpine' --- .vsts-ci.yml | 2 +- .vsts-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 3fd03fcc1..9efb421fd 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -65,7 +65,7 @@ extends: ubuntu2204: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 mariner20CrossArm: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine ubuntu2204DebPkg: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg sdl: diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 012166861..3df1cf509 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -203,7 +203,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine' buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm'