Skip to content

Add linux-musl-arm SOS support #3384

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
3 commits merged into from
Sep 15, 2022
Merged

Add linux-musl-arm SOS support #3384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
895ab9f
Add linux-musl-arm SOS support
Sep 14, 2022
73e2a15
Add linux-musl-arm to SOS/dotnet-dump packages
Sep 14, 2022
519a566
Add linux-musl-arm dbgshim to package
Sep 15, 2022
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
33 changes: 24 additions & 9 deletions diagnostics.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ stages:

- template: /eng/build.yml
parameters:
name: MacOS_cross
name: MacOS_arm64
osGroup: MacOS_cross
crossbuild: true
buildAndSkipTest: true
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -232,7 +247,6 @@ stages:
_BuildArch: arm64
_PublishArtifacts: bin/Linux.arm64.Release


############################
# #
# Test only legs #
Expand Down Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions src/dbgshim/pkg/microsoft.diagnostics.dbgshim.linux-musl-arm.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project>
<PropertyGroup>
<PackageRID>linux-musl-arm</PackageRID>
<PackageArch>arm</PackageArch>
</PropertyGroup>
<Import Project="Microsoft.Diagnostics.DbgShim.props" />
</Project>
4 changes: 4 additions & 0 deletions src/sos-packaging.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
<SosRequiredBinaries Include="$(ArtifactsBinDir)\Linux-musl.arm64.$(Configuration)\libsos.so" TargetRid="linux-musl-arm64" />
<SosRequiredBinaries Include="$(ArtifactsBinDir)\Linux-musl.arm64.$(Configuration)\sosdocsunix.txt" TargetRid="linux-musl-arm64" />

<SosRequiredBinaries Include="$(ArtifactsBinDir)\Linux-musl.arm.$(Configuration)\libsosplugin.so" TargetRid="linux-musl-arm" />
<SosRequiredBinaries Include="$(ArtifactsBinDir)\Linux-musl.arm.$(Configuration)\libsos.so" TargetRid="linux-musl-arm" />
<SosRequiredBinaries Include="$(ArtifactsBinDir)\Linux-musl.arm.$(Configuration)\sosdocsunix.txt" TargetRid="linux-musl-arm" />

<SosRequiredBinaries Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsosplugin.dylib" TargetRid="osx-x64" />
<SosRequiredBinaries Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsos.dylib" TargetRid="osx-x64" />
<SosRequiredBinaries Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\sosdocsunix.txt" TargetRid="osx-x64" />
Expand Down