Skip to content

Update arm/arm64 Linux cross build images #68561

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

Update arm/arm64 Linux cross build images #68561

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
c65791d
Update arm/arm64 Linux cross build images
janvorli Apr 26, 2022
26ec998
Update the Helix pipeline for running arm64 tests too
janvorli Apr 26, 2022
4d43d1a
Update GCC path for Mono
janvorli May 2, 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
4 changes: 2 additions & 2 deletions eng/pipelines/common/platform-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
targetRid: linux-arm
platform: Linux_arm
container:
image: ubuntu-16.04-cross-20210719121212-8a8d3be
image: ubuntu-18.04-cross-arm-20220426130400-6e40d49
registry: mcr
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
platform: Linux_arm64
container:
${{ if eq(parameters.container, '') }}:
image: ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
image: ubuntu-18.04-cross-arm64-20220426130400-6e40d49
${{ if ne(parameters.container, '') }}:
image: ${{ parameters.container }}
registry: mcr
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- (Ubuntu.2110.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-21.10-helix-arm64v8-20211116135000-0f8d97e
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- (Ubuntu.1804.ArmArch.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-20210106155927-56c6673
- (Ubuntu.1804.ArmArch.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20220426125905-97d8652

# Linux musl x64
- ${{ if eq(parameters.platform, 'Linux_musl_x64') }}:
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@
<MonoUseCrossTool>true</MonoUseCrossTool>
<MonoAotAbi>aarch64-linux-gnu</MonoAotAbi>
<MonoAotOffsetsFile>$(MonoObjCrossDir)offsets-aarch-linux-gnu.h</MonoAotOffsetsFile>
<MonoAotOffsetsPrefix>$(MonoCrossDir)/usr/lib/gcc/aarch64-linux-gnu/5</MonoAotOffsetsPrefix>
<MonoAotOffsetsPrefix>$(MonoCrossDir)/usr/lib/gcc/aarch64-linux-gnu/7</MonoAotOffsetsPrefix>
</PropertyGroup>

<!-- macOS host specific options -->
Expand Down