From 6f8cd126297ce2a9b189675810e9ea8b61b7bd3b Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Wed, 14 Sep 2022 13:42:09 -0700 Subject: [PATCH] Add linux-musl-arm SOS support Issue: https://github.com/dotnet/diagnostics/issues/1552 --- diagnostics.yml | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/diagnostics.yml b/diagnostics.yml index 9127a5f407..a3c2164984 100644 --- a/diagnostics.yml +++ b/diagnostics.yml @@ -173,7 +173,7 @@ stages: - template: /eng/build.yml parameters: - name: MacOS_cross + name: MacOS_arm64 osGroup: MacOS_cross crossbuild: true buildAndSkipTest: true @@ -191,7 +191,7 @@ stages: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - template: /eng/build.yml parameters: - name: Linux_cross + name: Linux_arm osGroup: Linux dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-20210719121212-8a8d3be crossrootfsDir: '/crossrootfs/arm' @@ -205,7 +205,7 @@ stages: - template: /eng/build.yml parameters: - name: Linux_cross64 + name: Linux_arm64 osGroup: Linux dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-20210719121212-8a8d3be crossrootfsDir: '/crossrootfs/arm64' @@ -219,7 +219,22 @@ stages: - template: /eng/build.yml parameters: - name: Alpine_cross64 + name: Linux_musl_arm + osGroup: Linux + dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm-alpine-20210923140502-78f7860 + crossrootfsDir: '/crossrootfs/arm' + artifactsTargetPath: bin/Linux-musl.arm.Release + buildAndSkipTest: true + strategy: + matrix: + Build_Release: + _BuildConfig: Release + _BuildArch: arm + _PublishArtifacts: bin/Linux.arm.Release + + - template: /eng/build.yml + parameters: + name: Linux_musl_arm64 osGroup: Linux dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20210923140502-78f7860 crossrootfsDir: '/crossrootfs/arm64' @@ -232,7 +247,6 @@ stages: _BuildArch: arm64 _PublishArtifacts: bin/Linux.arm64.Release - ############################ # # # Test only legs # @@ -316,10 +330,11 @@ stages: - CentOS_7 - Alpine3_13 - MacOS - - MacOS_cross - - Linux_cross - - Linux_cross64 - - Alpine_cross64 + - MacOS_arm64 + - Linux_arm + - Linux_arm64 + - Linux_musl_arm + - Linux_musl_arm64 condition: succeeded() pool: name: NetCore1ESPool-Internal