Skip to content

Upgrade to AzureLinux 3.0 in AzDO builds #697

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

Draft
wants to merge 5 commits into
base: dotnet/main-19.x
Choose a base branch
from
Draft

Upgrade to AzureLinux 3.0 in AzDO builds #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f7583d
Upgrade to AzureLinux 3.0 in AzDO builds
akoeplinger Oct 2, 2025
cc9b067
Install zlib-devel
akoeplinger Oct 2, 2025
a0fe1d3
Use sudo
akoeplinger Oct 2, 2025
1ebfa81
Fix typo
akoeplinger Oct 2, 2025
de799e2
Use su instead of sudo
akoeplinger Oct 2, 2025
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
10 changes: 9 additions & 1 deletion eng/azure-pipelines-codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ stages:
x64:
assetManifestOS: linux
assetManifestPlatform: x64
imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64
imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64
rootfs: /crossrootfs/x64
ExtraArgs: -p:LibsRoot=/crossrootfs/x64/usr/lib/x86_64-linux-gnu
ClangTargetArg: /p:ClangTarget=x86_64-linux-gnu
Expand All @@ -63,6 +63,14 @@ stages:
git reset --hard HEAD
displayName: 'Clean up working directory'

- bash: |
su -c "tdnf install -y which"
displayName: 'Install CodeQL dependencies'

- bash: |
su -c "tdnf install -y zlib-devel"
displayName: 'Install build dependencies'

- task: CodeQL3000Init@0
displayName: Initialize CodeQL (manually-injected)

Expand Down
25 changes: 13 additions & 12 deletions eng/azure-pipelines-public.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@ stages:
enablePublishBuildArtifacts: true
enablePublishBuildAssets: true
enablePublishUsingPipelines: true
enableSourceBuild: true
sourceBuildParameters:
platforms:
- name: 'AlmaLinux_8_Portable'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build'
jobProperties:
timeoutInMinutes: 600
jobs:

############ LINUX BUILD ############
Expand All @@ -47,7 +40,7 @@ stages:
x64:
assetManifestOS: linux
assetManifestPlatform: x64
imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64
imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64
rootfs: /crossrootfs/x64
ExtraArgs: -p:LibsRoot=/crossrootfs/x64/usr/lib/x86_64-linux-gnu
ClangTargetArg: /p:ClangTarget=x86_64-linux-gnu
Expand All @@ -56,7 +49,7 @@ stages:
arm64:
assetManifestOS: linux
assetManifestPlatform: arm64
imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64
imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64
rootfs: /crossrootfs/arm64
ExtraArgs: -p:LibsRoot=/crossrootfs/arm64/usr/lib/aarch64-linux-gnu
ClangTargetArg: /p:ClangTarget=aarch64-linux-gnu
Expand All @@ -65,7 +58,7 @@ stages:
arm:
assetManifestOS: linux
assetManifestPlatform: arm
imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm
rootfs: /crossrootfs/arm
ExtraArgs: -p:LibsRoot=/crossrootfs/arm/usr/lib/arm-linux-gnueabihf
ClangTargetArg: /p:ClangTarget=arm-linux-gnueabihf
Expand All @@ -83,6 +76,10 @@ stages:
git reset --hard HEAD
displayName: 'Clean up working directory'

- bash: |
ssu -c "tdnf install -y zlib-devel"
displayName: 'Install build dependencies'

- bash: |
./build.sh --ci --restore --build --pack $(archflag) --configuration $(_BuildConfig) $(_InternalBuildArgs) $(ClangBinDirArg) $(ClangTargetArg) $(ExtraArgs)
displayName: 'Build and package'
Expand All @@ -100,7 +97,7 @@ stages:
x64:
assetManifestOS: linux-musl
assetManifestPlatform: x64
imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64-alpine
imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64-alpine
rootfs: /crossrootfs/x64
ExtraArgs: -p:LibsRoot=/crossrootfs/x64/lib
ClangTargetArg: /p:ClangTarget=x86_64-alpine-linux-musl
Expand All @@ -109,7 +106,7 @@ stages:
arm64:
assetManifestOS: linux-musl
assetManifestPlatform: arm64
imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
imagename: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64-alpine
rootfs: /crossrootfs/arm64
ExtraArgs: -p:LibsRoot=/crossrootfs/arm64/lib
ClangTargetArg: /p:ClangTarget=aarch64-alpine-linux-musl
Expand All @@ -127,6 +124,10 @@ stages:
git reset --hard HEAD
displayName: 'Clean up working directory'

- bash: |
su -c "tdnf install -y zlib-devel"
displayName: 'Install build dependencies'

- bash: |
./build.sh --ci --restore --build --pack $(archflag) --configuration $(_BuildConfig) $(_InternalBuildArgs) /p:OutputRid=linux-musl-$(assetManifestPlatform) $(ClangBinDirArg) $(ClangTargetArg) $(ExtraArgs)
displayName: 'Build and package'
Expand Down
34 changes: 19 additions & 15 deletions eng/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,35 @@ parameters:
default:
- arch: x64
assetManifestOS: linux
imagename: mariner2crossamd64
imagename: azurelinux3crossamd64
rootfs: /crossrootfs/x64
ExtraArgs: -p:LibsRoot=/crossrootfs/x64/usr/lib/x86_64-linux-gnu
ClangTargetArg: /p:ClangTarget=x86_64-linux-gnu
ClangBinDirArg: /p:ClangBinDir=/usr/local/bin
- arch: arm64
assetManifestOS: linux
imagename: mariner2crossarm64
imagename: azurelinux3crossarm64
rootfs: /crossrootfs/arm64
ExtraArgs: -p:LibsRoot=/crossrootfs/arm64/usr/lib/aarch64-linux-gnu
ClangTargetArg: /p:ClangTarget=aarch64-linux-gnu
ClangBinDirArg: /p:ClangBinDir=/usr/local/bin
- arch: arm
assetManifestOS: linux
imagename: mariner2crossarm
imagename: azurelinux3crossarm
rootfs: /crossrootfs/arm
ExtraArgs: -p:LibsRoot=/crossrootfs/arm/usr/lib/arm-linux-gnueabihf
ClangTargetArg: /p:ClangTarget=arm-linux-gnueabihf
ClangBinDirArg: /p:ClangBinDir=/usr/local/bin
- arch: x64
assetManifestOS: linux-musl
imagename: mariner2crossamd64alpine
imagename: azurelinux3crossamd64alpine
rootfs: /crossrootfs/x64
ExtraArgs: -p:LibsRoot=/crossrootfs/x64/lib -p:OutputRid=linux-musl-x64
ClangTargetArg: /p:ClangTarget=x86_64-alpine-linux-musl
ClangBinDirArg: /p:ClangBinDir=/usr/local/bin
- arch: arm64
assetManifestOS: linux-musl
imagename: mariner2crossarm64alpine
imagename: azurelinux3crossarm64alpine
rootfs: /crossrootfs/arm64
ExtraArgs: -p:LibsRoot=/crossrootfs/arm64/lib -p:OutputRid=linux-musl-arm64
ClangTargetArg: /p:ClangTarget=aarch64-alpine-linux-musl
Expand Down Expand Up @@ -94,16 +94,16 @@ extends:
credscan:
suppressionsFile: $(Build.SourcesDirectory)/.config/CredScanSuppressions.json
containers:
mariner2crossamd64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64
mariner2crossarm64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64
mariner2crossarm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
mariner2crossamd64alpine:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64-alpine
mariner2crossarm64alpine:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
azurelinux3crossamd64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64
azurelinux3crossarm64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64
azurelinux3crossarm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm
azurelinux3crossamd64alpine:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64-alpine
azurelinux3crossarm64alpine:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64-alpine
stages:
- stage: build
displayName: Build
Expand Down Expand Up @@ -140,6 +140,10 @@ extends:
git reset --hard HEAD
displayName: 'Clean up working directory'

- bash: |
su -c "tdnf install -y zlib-devel"
displayName: 'Install build dependencies'

- bash: |
./build.sh --ci --restore --build --pack --arch ${{ buildjob.arch }} --configuration $(_BuildConfig) $(_InternalBuildArgs) ${{ buildjob.ClangBinDirArg }} ${{ buildjob.ClangTargetArg }} ${{ buildjob.ExtraArgs }}
displayName: 'Build and package'
Expand Down
Loading