Skip to content

Commit 1d69684

Browse files
authored
Update Alpine and Azure Linux versions (#110476)
* Add Alpine and Ubuntu versions * Revert Ubuntu 24.10 entries * Add coverage for latest Debian and Ubuntu * Revert breaks
1 parent e34ec6c commit 1d69684

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,23 @@ jobs:
7777
# Linux musl x64
7878
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
7979
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
80-
- (Alpine.320.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-amd64
80+
- (Alpine.321.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
8181
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
82-
- (Alpine.320.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-amd64
82+
- (Alpine.321.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
8383

8484
# Linux musl arm32
8585
- ${{ if eq(parameters.platform, 'linux_musl_arm') }}:
8686
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
87-
- (Alpine.320.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-arm32v7
87+
- (Alpine.321.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-arm32v7
8888
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
89-
- (Alpine.320.Arm32)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-arm32v7
89+
- (Alpine.321.Arm32)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-arm32v7
9090

9191
# Linux musl arm64
9292
- ${{ if eq(parameters.platform, 'linux_musl_arm64') }}:
9393
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
94-
- (Alpine.320.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-arm64v8
94+
- (Alpine.321.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-arm64v8
9595
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
96-
- (Alpine.320.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-arm64v8
96+
- (Alpine.321.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-arm64v8
9797

9898
# Linux x64
9999
- ${{ if eq(parameters.platform, 'linux_x64') }}:

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

+3-6
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@ jobs:
4141
# Linux musl x64
4242
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
4343
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
44-
- (Alpine.320.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-amd64
44+
- (Alpine.321.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
4545
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
46-
- (Alpine.320.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-amd64
47-
- (Alpine.318.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64
46+
- (Alpine.321.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
4847

4948
# Linux musl arm64
5049
- ${{ if and(eq(parameters.platform, 'linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}:
51-
- (Alpine.320.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-arm64v8
52-
- (Alpine.318.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8
50+
- (Alpine.321.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-arm64v8
5351

5452
# Linux x64
5553
- ${{ if eq(parameters.platform, 'linux_x64') }}:
@@ -66,7 +64,6 @@ jobs:
6664
- (Fedora.41.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-41-helix
6765
- Ubuntu.2204.Amd64.Open
6866
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
69-
- (Mariner.2.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64
7067
- (AzureLinux.3.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64
7168
- (openSUSE.15.2.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64
7269
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:

0 commit comments

Comments
 (0)