Skip to content

Update EOL versions for releases/8.0 #54791

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 1 commit into from
Mar 27, 2024
Merged

Update EOL versions for releases/8.0 #54791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .azure/pipelines/ci-public.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ stages:
jobDisplayName: "Build: Linux Musl ARM"
agentOs: Linux
useHostedUbuntu: false
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
buildArgs:
--arch arm
--os-name linux-musl
Expand Down Expand Up @@ -478,7 +478,7 @@ stages:
jobDisplayName: "Build: Linux Musl ARM64"
agentOs: Linux
useHostedUbuntu: false
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm64-alpine
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
buildArgs:
--arch arm64
--os-name linux-musl
Expand Down Expand Up @@ -607,7 +607,7 @@ stages:
parameters:
platform:
name: 'Managed'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
buildScript: './eng/build.sh $(_PublishArgs) --no-build-nodejs --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
skipPublishValidation: true
jobProperties:
Expand Down
20 changes: 10 additions & 10 deletions .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ extends:
image: 1es-windows-2022-pt
os: windows
containers:
alpine314WithNode:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-WithNode
ubuntu1804CrossArmAlpine:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine
ubuntu1804CrossArm64Alpine:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine
alpine319WithNode:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
mariner20CrossArmAlpine:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
mariner20CrossArm64Alpine:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
stages:
- stage: build
displayName: Build
Expand Down Expand Up @@ -477,7 +477,7 @@ extends:
jobName: Linux_musl_x64_build
jobDisplayName: "Build: Linux Musl x64"
agentOs: Linux
container: alpine314WithNode
container: alpine319WithNode
buildArgs:
--arch x64
--os-name linux-musl
Expand Down Expand Up @@ -512,7 +512,7 @@ extends:
jobDisplayName: "Build: Linux Musl ARM"
agentOs: Linux
useHostedUbuntu: false
container: ubuntu1804CrossArmAlpine
container: mariner20CrossArmAlpine
buildArgs:
--arch arm
--os-name linux-musl
Expand Down Expand Up @@ -546,7 +546,7 @@ extends:
jobDisplayName: "Build: Linux Musl ARM64"
agentOs: Linux
useHostedUbuntu: false
container: ubuntu1804CrossArm64Alpine
container: mariner20CrossArm64Alpine
buildArgs:
--arch arm64
--os-name linux-musl
Expand Down Expand Up @@ -675,7 +675,7 @@ extends:
parameters:
platform:
name: 'Managed'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
buildScript: './eng/build.sh $(_PublishArgs) --no-build-nodejs --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
skipPublishValidation: true
jobProperties:
Expand Down
16 changes: 8 additions & 8 deletions eng/targets/Helix.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project>
<!-- This file is shared between Helix.proj and .csproj files. -->
<PropertyGroup>
<HelixQueueAlmaLinux8>(AlmaLinux.8.Amd64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:almalinux-8-helix-amd64</HelixQueueAlmaLinux8>
<HelixQueueAlpine316>(Alpine.316.Amd64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:alpine-3.16-helix-amd64</HelixQueueAlpine316>
<HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11>
<HelixQueueFedora34>(Fedora.34.Amd64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:fedora-34-helix</HelixQueueFedora34>
<HelixQueueMariner>(Mariner)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix</HelixQueueMariner>
<HelixQueueArmDebian12>(Debian.12.Arm64.Open)ubuntu.2004[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm64v8</HelixQueueArmDebian12>
<HelixQueueAlmaLinux8>(AlmaLinux.8.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:almalinux-8-helix-amd64</HelixQueueAlmaLinux8>
<HelixQueueAlpine317>(Alpine.317.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64</HelixQueueAlpine317>
<HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11>
<HelixQueueFedora38>(Fedora.38.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:fedora-38-helix</HelixQueueFedora38>
<HelixQueueMariner>(Mariner)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix</HelixQueueMariner>
<HelixQueueArmDebian12>(Debian.12.Arm64.Open)ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm64v8</HelixQueueArmDebian12>

<!-- Do not attempt to override global property. -->
<RunQuarantinedTests Condition=" '$(RunQuarantinedTests)' == '' ">false</RunQuarantinedTests>
Expand Down Expand Up @@ -42,9 +42,9 @@
<HelixAvailableTargetQueue Include="$(HelixQueueAlmaLinux8)" Platform="Linux" />

<!-- Containers -->
<HelixAvailableTargetQueue Include="$(HelixQueueAlpine316)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueAlpine317)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueDebian11)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueFedora34)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueFedora38)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueMariner)" Platform="Linux" />
<HelixAvailableTargetQueue Include="$(HelixQueueArmDebian12)" Platform="Linux" />

Expand Down