Enable Alpine ARM support (#41982)

* Enable Alpine ARM support This change enables Alpine ARM support in the lab build scripts, packages and RID graph. It enables CI and official builds. No test leg execution until packages are produced.
dotnet · Sep 10, 2020 · d992e0c · d992e0c
1 parent bb921d6
commit d992e0c
Show file tree

Hide file tree

Showing 10 changed files with 250 additions and 2 deletions.
diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
@@ -97,6 +97,31 @@ jobs:
         helixQueueGroup: ${{ parameters.helixQueueGroup }}
         ${{ insert }}: ${{ parameters.jobParameters }}
 
+# Linux musl arm
+
+- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_arm'), eq(parameters.platformGroup, 'all')) }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Linux
+      osSubgroup: _musl
+      archType: arm
+      platform: Linux_musl_arm
+      container:
+        image: ubuntu-18.04-cross-arm-alpine-20200818211451-14441ae
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        crossrootfsDir: '/crossrootfs/arm'
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
 # Linux musl arm64
 
 - ${{ if or(containsValue(parameters.platforms, 'Linux_musl_arm64'), eq(parameters.platformGroup, 'all')) }}:

diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
@@ -47,6 +47,13 @@ jobs:
       - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
         - (Alpine.312.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-20200602002622-e06dc59
 
+    # Linux musl arm32
+    - ${{ if eq(parameters.platform, 'Linux_musl_arm') }}:
+      - ${{ if eq(variables['System.TeamProject'], 'public') }}:
+        - (Alpine.312.Arm32.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-arm32v7-20200908125213-5bece88
+      - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+        - (Alpine.312.Arm32)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-arm32v7-20200908125213-5bece88
+
     # Linux musl arm64
     - ${{ if eq(parameters.platform, 'Linux_musl_arm64') }}:
       - ${{ if eq(variables['System.TeamProject'], 'public') }}:

diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
@@ -54,6 +54,7 @@ stages:
       - Linux_arm
       - Linux_arm64
       - Linux_musl_x64
+      - Linux_musl_arm
       - Linux_musl_arm64
       - Windows_NT_x86
       - Windows_NT_x64
@@ -75,6 +76,7 @@ stages:
         - Linux_arm
         - Linux_arm64
         - Linux_musl_x64
+        - Linux_musl_arm
         - Linux_musl_arm64
         - Windows_NT_x64
         - Windows_NT_arm
@@ -104,6 +106,7 @@ stages:
       - Linux_arm64
       - Linux_musl_x64
       - Browser_wasm
+      # - Linux_musl_arm
       # - Linux_musl_arm64
       # - Windows_NT_x64 enable once coreclr.dll has a version header: https://github.com/dotnet/runtime/issues/37503
       # - Windows_NT_x86
@@ -174,6 +177,7 @@ stages:
       - Linux_arm
       - Linux_arm64
       - Linux_musl_x64
+      - Linux_musl_arm
       - Linux_musl_arm64
       - Windows_NT_x86
       - Windows_NT_x64
@@ -215,6 +219,7 @@ stages:
       - Linux_arm
       - Linux_arm64
       - Linux_musl_x64
+      - Linux_musl_arm
       - Linux_musl_arm64
       - Windows_NT_x86
       - Windows_NT_x64

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
@@ -144,6 +144,7 @@ jobs:
     - Linux_x64
     - Linux_arm
     - Linux_arm64
+    - Linux_musl_arm
     - Linux_musl_arm64
     - Linux_musl_x64
     - Windows_NT_x86
@@ -209,6 +210,7 @@ jobs:
     - Linux_arm
     - Linux_arm64
     - Linux_musl_x64
+    - Linux_musl_arm
     - Linux_musl_arm64
     - Windows_NT_x64
     - Windows_NT_x86
@@ -563,6 +565,7 @@ jobs:
     buildConfig: Release
     platforms:
     - Linux_arm
+    - Linux_musl_arm
     - Linux_musl_arm64
     - Windows_NT_arm
     - Windows_NT_arm64
@@ -651,6 +654,7 @@ jobs:
     buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
     platforms:
       - Linux_arm
+      - Linux_musl_arm
       - Linux_musl_arm64
       - Windows_NT_x86
       - Windows_NT_arm

diff --git a/src/coreclr/src/.nuget/Directory.Build.props b/src/coreclr/src/.nuget/Directory.Build.props
@@ -166,6 +166,9 @@
     <OfficialBuildRID Include="linux-arm">
       <Platform>arm</Platform>
     </OfficialBuildRID>
+    <OfficialBuildRID Include="linux-musl-arm">
+      <Platform>arm</Platform>
+    </OfficialBuildRID>
     <OfficialBuildRID Include="linux-arm64">
       <Platform>arm64</Platform>
     </OfficialBuildRID>

diff --git a/...c/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj b/...c/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <BuildIdentityPackage>false</BuildIdentityPackage>
-    <SupportedRids>linux-x64;linux-musl-x64;linux-arm64;linux-musl-arm64;linux-arm;</SupportedRids>
+    <SupportedRids>linux-x64;linux-musl-x64;linux-arm64;linux-musl-arm64;linux-arm;linux-musl-arm</SupportedRids>
   </PropertyGroup>
 
   <Target Name="VerifyCrossDacProperties" BeforeTargets="Build">
@@ -19,6 +19,7 @@
         <AdditionalProperties Condition="'%(Project.PackageTargetRuntime)' == 'linux-arm64'">%(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux.arm64.$(Configuration)/x64</AdditionalProperties>
         <AdditionalProperties Condition="'%(Project.PackageTargetRuntime)' == 'linux-musl-arm64'">%(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux_musl.arm64.$(Configuration)/x64</AdditionalProperties>
         <AdditionalProperties Condition="'%(Project.PackageTargetRuntime)' == 'linux-arm'">%(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux.arm.$(Configuration)/x86</AdditionalProperties>
+        <AdditionalProperties Condition="'%(Project.PackageTargetRuntime)' == 'linux-musl-arm'">%(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux_musl.arm.$(Configuration)/x86</AdditionalProperties>
       </_projectsToBuild>
     </ItemGroup>
 

diff --git a/src/installer/pkg/projects/netcoreappRIDs.props b/src/installer/pkg/projects/netcoreappRIDs.props
@@ -30,6 +30,9 @@
     <OfficialBuildRID Include="linux-arm64">
       <Platform>arm64</Platform>
     </OfficialBuildRID>
+    <OfficialBuildRID Include="linux-musl-arm">
+      <Platform>arm</Platform>
+    </OfficialBuildRID>
     <OfficialBuildRID Include="linux-musl-arm64">
       <Platform>arm64</Platform>
     </OfficialBuildRID>

diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -7,6 +7,18 @@
     "any",
     "base"
   ],
+  "alpine-arm": [
+    "alpine-arm",
+    "alpine",
+    "linux-musl-arm",
+    "linux-musl",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine-arm64": [
     "alpine-arm64",
     "alpine",
@@ -44,6 +56,28 @@
     "any",
     "base"
   ],
+  "alpine.3.10-arm": [
+    "alpine.3.10-arm",
+    "alpine.3.10",
+    "alpine.3.9-arm",
+    "alpine.3.9",
+    "alpine.3.8-arm",
+    "alpine.3.8",
+    "alpine.3.7-arm",
+    "alpine.3.7",
+    "alpine.3.6-arm",
+    "alpine.3.6",
+    "alpine-arm",
+    "alpine",
+    "linux-musl-arm",
+    "linux-musl",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.10-arm64": [
     "alpine.3.10-arm64",
     "alpine.3.10",
@@ -102,6 +136,30 @@
     "any",
     "base"
   ],
+  "alpine.3.11-arm": [
+    "alpine.3.11-arm",
+    "alpine.3.11",
+    "alpine.3.10-arm",
+    "alpine.3.10",
+    "alpine.3.9-arm",
+    "alpine.3.9",
+    "alpine.3.8-arm",
+    "alpine.3.8",
+    "alpine.3.7-arm",
+    "alpine.3.7",
+    "alpine.3.6-arm",
+    "alpine.3.6",
+    "alpine-arm",
+    "alpine",
+    "linux-musl-arm",
+    "linux-musl",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.11-arm64": [
     "alpine.3.11-arm64",
     "alpine.3.11",
@@ -165,6 +223,32 @@
     "any",
     "base"
   ],
+  "alpine.3.12-arm": [
+    "alpine.3.12-arm",
+    "alpine.3.12",
+    "alpine.3.11-arm",
+    "alpine.3.11",
+    "alpine.3.10-arm",
+    "alpine.3.10",
+    "alpine.3.9-arm",
+    "alpine.3.9",
+    "alpine.3.8-arm",
+    "alpine.3.8",
+    "alpine.3.7-arm",
+    "alpine.3.7",
+    "alpine.3.6-arm",
+    "alpine.3.6",
+    "alpine-arm",
+    "alpine",
+    "linux-musl-arm",
+    "linux-musl",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.12-arm64": [
     "alpine.3.12-arm64",
     "alpine.3.12",
@@ -226,6 +310,20 @@
     "any",
     "base"
   ],
+  "alpine.3.6-arm": [
+    "alpine.3.6-arm",
+    "alpine.3.6",
+    "alpine-arm",
+    "alpine",
+    "linux-musl-arm",
+    "linux-musl",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.6-arm64": [
     "alpine.3.6-arm64",
     "alpine.3.6",
@@ -264,6 +362,22 @@
     "any",
     "base"
   ],
+  "alpine.3.7-arm": [
+    "alpine.3.7-arm",
+    "alpine.3.7",
+    "alpine.3.6-arm",
+    "alpine.3.6",
+    "alpine-arm",
+    "alpine",
+    "linux-musl-arm",
+    "linux-musl",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.7-arm64": [
     "alpine.3.7-arm64",
     "alpine.3.7",
@@ -307,6 +421,24 @@
     "any",
     "base"
   ],
+  "alpine.3.8-arm": [
+    "alpine.3.8-arm",
+    "alpine.3.8",
+    "alpine.3.7-arm",
+    "alpine.3.7",
+    "alpine.3.6-arm",
+    "alpine.3.6",
+    "alpine-arm",
+    "alpine",
+    "linux-musl-arm",
+    "linux-musl",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.8-arm64": [
     "alpine.3.8-arm64",
     "alpine.3.8",
@@ -355,6 +487,26 @@
     "any",
     "base"
   ],
+  "alpine.3.9-arm": [
+    "alpine.3.9-arm",
+    "alpine.3.9",
+    "alpine.3.8-arm",
+    "alpine.3.8",
+    "alpine.3.7-arm",
+    "alpine.3.7",
+    "alpine.3.6-arm",
+    "alpine.3.6",
+    "alpine-arm",
+    "alpine",
+    "linux-musl-arm",
+    "linux-musl",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.9-arm64": [
     "alpine.3.9-arm64",
     "alpine.3.9",