diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 8e4f528e5..3fd03fcc1 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -64,8 +64,8 @@ extends: image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 ubuntu2204: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 - ubuntu2204CrossArmAlpine: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine + mariner20CrossArm: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm ubuntu2204DebPkg: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg sdl: @@ -233,7 +233,7 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: ubuntu2204CrossArmAlpine + container: mariner20CrossArm buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 2a762dd9a..012166861 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:ubuntu-22.04-cross-arm-alpine' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm' buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 43f0c8633..51597c437 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -13,7 +13,7 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- - alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 + alpine319Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19 centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 @@ -112,14 +112,14 @@ stages: - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline - buildName: Alpine317_Offline_MsftSdk + buildName: Alpine319_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 pool: name: ${{ variables.defaultPoolName }} demands: ${{ variables.defaultPoolDemands }} - container: ${{ parameters.alpine317Container }} + container: ${{ parameters.alpine319Container }} buildFromArchive: false # ✅ enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ diff --git a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml index 36eed8cbd..4e49c7fa8 100644 --- a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml @@ -1,6 +1,6 @@ schedules: -- cron: "0 11 * * 1-5" - displayName: Run on weekdays at 11am UTC +- cron: "0 11 * * 1-5" + displayName: Run on weekdays at 11am UTC branches: include: - main @@ -47,8 +47,8 @@ jobs: - template: templates/jobs/sdk-diff-tests.yml parameters: - buildName: Alpine317_Offline_MsftSdk - targetRid: alpine.3.17-x64 + buildName: Alpine319_Offline_MsftSdk + targetRid: alpine.3.19-x64 architecture: x64 dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}