Skip to content

Commit c39ecb9

Browse files
authored
Merge pull request #26281 from janvorli/add-musl-arm-support
Add build for linux-musl-arm
2 parents 4dfa2c7 + 7bba815 commit c39ecb9

File tree

4 files changed

+38
-1
lines changed

4 files changed

+38
-1
lines changed

.azure/pipelines/ci.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,40 @@ stages:
511511
parameters:
512512
inputName: Linux_musl_x64
513513

514+
# Build Linux Musl ARM
515+
- template: jobs/default-build.yml
516+
parameters:
517+
jobName: Linux_musl_arm_build
518+
jobDisplayName: "Build: Linux Musl ARM"
519+
agentOs: Linux
520+
useHostedUbuntu: false
521+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-20200827125937-14441ae
522+
buildScript: ./build.sh
523+
buildArgs:
524+
--arch arm
525+
--os-name linux-musl
526+
--pack
527+
--all
528+
--no-build-nodejs
529+
--no-build-java
530+
-p:OnlyPackPlatformSpecificPackages=true
531+
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm.xml
532+
$(_BuildArgs)
533+
$(_PublishArgs)
534+
$(_InternalRuntimeDownloadArgs)
535+
installNodeJs: false
536+
installJdk: false
537+
artifacts:
538+
- name: Linux_musl_arm_Logs
539+
path: artifacts/log/
540+
publishOnError: true
541+
includeForks: true
542+
- name: Linux_musl_arm_Packages
543+
path: artifacts/packages/
544+
- template: jobs/codesign-xplat.yml
545+
parameters:
546+
inputName: Linux_musl_arm
547+
514548
# Build Linux Musl ARM64
515549
- template: jobs/default-build.yml
516550
parameters:
@@ -739,6 +773,7 @@ stages:
739773
- CodeSign_Xplat_Linux_arm
740774
- CodeSign_Xplat_Linux_arm64
741775
- CodeSign_Xplat_Linux_musl_x64
776+
- CodeSign_Xplat_Linux_musl_arm
742777
- CodeSign_Xplat_Linux_musl_arm64
743778
# In addition to the dependencies above, ensure the build was successful overall.
744779
- Source_Build

Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
win-arm64;
154154
osx-x64;
155155
linux-musl-x64;
156+
linux-musl-arm;
156157
linux-musl-arm64;
157158
linux-x64;
158159
linux-arm;

eng/Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ and are generated based on the last package release.
9494
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-arm" />
9595
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-arm64" />
9696
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-x64" />
97+
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-arm" />
9798
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-arm64" />
9899
</ItemGroup>
99100

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
9292
<PathSeparator Condition="'$(PathSeparator)' == ''">:</PathSeparator>
9393
<PathSeparator Condition=" '$(TargetOsName)' == 'win' ">%3B</PathSeparator>
9494

95-
<CrossCompileDirectory Condition=" '$(TargetRuntimeIdentifier)' == 'linux-arm' ">x64_arm</CrossCompileDirectory>
95+
<CrossCompileDirectory Condition=" '$(TargetRuntimeIdentifier)' == 'linux-arm' OR '$(TargetRuntimeIdentifier)' == 'linux-musl-arm'">x64_arm</CrossCompileDirectory>
9696
<CrossCompileDirectory Condition=" '$(TargetArchitecture)' == 'arm64' AND '$(BuildArchitecture)' != 'arm64' ">x64_arm64</CrossCompileDirectory>
9797
<CrossCompileDirectory Condition=" '$(TargetRuntimeIdentifier)' == 'win-arm' ">x86_arm</CrossCompileDirectory>
9898

0 commit comments

Comments
 (0)