diff --git a/eng/azure-pipelines-codeql.yml b/eng/azure-pipelines-codeql.yml index edd6b6805a03d..ab87d1eff5f26 100644 --- a/eng/azure-pipelines-codeql.yml +++ b/eng/azure-pipelines-codeql.yml @@ -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 @@ -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) diff --git a/eng/azure-pipelines-public.yml b/eng/azure-pipelines-public.yml index a86fa4750a5a9..bd8aaef569166 100644 --- a/eng/azure-pipelines-public.yml +++ b/eng/azure-pipelines-public.yml @@ -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 ############ @@ -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 @@ -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 @@ -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 @@ -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' @@ -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 @@ -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 @@ -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' diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index 2ecf2d5034604..0bf454c76e0ad 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -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 @@ -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 @@ -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'