mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[VMR] Light up basic ARM32/ARM64 lanes (#18883)

Browse source
This commit is contained in:
Jo Shields 2024-04-04 15:49:44 -04:00 committed by GitHub
parent b79e19a31b
commit 51def0db9d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 90 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
eng/pipelines/templates/stages/vmr-build.yml
View file

@ -700,19 +700,55 @@ stages:
targetOS: linux
targetArchitecture: x64
# Mariner x64->non-x64 builds are currently broken, see https://github.com/dotnet/source-build/issues/3698
- template: ../jobs/vmr-build.yml
parameters:
buildName: Mariner_x64_Cross
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: arm
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.marinerArmCrossContainer }}
crossRootFs: '/crossrootfs/arm'
targetOS: linux
targetArchitecture: arm
# - template: ../jobs/vmr-build.yml
# parameters:
# buildName: Mariner_x64_Cross
# isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
# vmrBranch: ${{ variables.VmrBranch }}
# architecture: arm64
# pool: ${{ parameters.pool_Linux }}
# container: ${{ variables.marinerArm64CrossContainer }}
# crossRootFs: '/crossrootfs/arm64'
# targetOS: linux
# targetArchitecture: arm64
- template: ../jobs/vmr-build.yml
parameters:
buildName: Mariner_x64_Cross_Mono
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: arm
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.marinerArmCrossContainer }}
crossRootFs: '/crossrootfs/arm'
useMonoRuntime: true
targetOS: linux
targetArchitecture: arm
- template: ../jobs/vmr-build.yml
parameters:
buildName: Mariner_x64_Cross
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: arm64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.marinerArm64CrossContainer }}
crossRootFs: '/crossrootfs/arm64'
targetOS: linux
targetArchitecture: arm64
- template: ../jobs/vmr-build.yml
parameters:
buildName: Mariner_x64_Cross_Mono
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: arm64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.marinerArm64CrossContainer }}
crossRootFs: '/crossrootfs/arm64'
useMonoRuntime: true
targetOS: linux
targetArchitecture: arm64
- template: ../jobs/vmr-build.yml
parameters:

2
eng/pipelines/templates/variables/vmr-build.yml
View file

@ -24,6 +24,8 @@ variables:
value: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-arm64
- name: marinerX64CrossContainer
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64
- name: marinerArmCrossContainer
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
- name: marinerArm64CrossContainer
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64
- name: androidCrossContainer

0
src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkAssemblyVersions-linux-arm.diff Normal file
View file

0
src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkAssemblyVersions-linux-arm64.diff Normal file
View file

20
src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkFiles-linux-arm.diff Normal file
View file

@ -0,0 +1,20 @@
diff --git a/msftSdkFiles.txt b/ubSdkFiles.txt
index ------------
--- a/msftSdkFiles.txt
+++ b/ubSdkFiles.txt
@@ ------------ @@
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll
+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CodeDom.dll
@@ ------------ @@
./sdk/x.y.z/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll
./sdk/x.y.z/Microsoft.NET.StringTools.dll
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledCliTools.props
-./sdk/x.y.z/Microsoft.NETCoreSdk.BundledMSBuildInformation.props
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledVersions.props
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.props
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.targets

20
src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkFiles-linux-arm64.diff Normal file
View file

@ -0,0 +1,20 @@
diff --git a/msftSdkFiles.txt b/ubSdkFiles.txt
index ------------
--- a/msftSdkFiles.txt
+++ b/ubSdkFiles.txt
@@ ------------ @@
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll
+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CodeDom.dll
@@ ------------ @@
./sdk/x.y.z/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll
./sdk/x.y.z/Microsoft.NET.StringTools.dll
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledCliTools.props
-./sdk/x.y.z/Microsoft.NETCoreSdk.BundledMSBuildInformation.props
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledVersions.props
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.props
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.targets