Skip to content
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

[VMR] Try lighting up ARM32/ARM64 lanes #18883

Merged
merged 7 commits into from
Apr 4, 2024
Merged

[VMR] Try lighting up ARM32/ARM64 lanes #18883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a9ef94d
[VMR] Try lighting up ARM32/ARM64 lanes
Mar 5, 2024
0dd941d
force full build
Mar 5, 2024
70b1259
Merge remote-tracking branch 'origin/main' into arm-vmr
Apr 4, 2024
a9aee42
Revert temp change, we seem to have a pipeline for this now
Apr 4, 2024
716109c
Add ARM(64) linux baselines
Apr 4, 2024
247dee3
Re-add missing `container` value from yml
Apr 4, 2024
14d75a2
Merge branch 'main' into arm-vmr
directhex Apr 4, 2024
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
62 changes: 49 additions & 13 deletions eng/pipelines/templates/stages/vmr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 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
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_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:
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/templates/variables/vmr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Empty file added ...oft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkAssemblyVersions-linux-arm.diff
View file
Open in desktop
Empty file.
Empty file added ...t.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkAssemblyVersions-linux-arm64.diff
View file
Open in desktop
Empty file.
20 changes: 20 additions & 0 deletions ...test/Microsoft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkFiles-linux-arm.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 20 additions & 0 deletions ...st/Microsoft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkFiles-linux-arm64.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading