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

Jump to bottom

Build Mono LLVM legs on the CBL-Mariner images, but run the AOTing steps on CentOS Stream 8 with binutils #85273

Merged
merged 4 commits into from
Apr 25, 2023
Merged

Build Mono LLVM legs on the CBL-Mariner images, but run the AOTing steps on CentOS Stream 8 with binutils #85273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce97c81
Build Mono LLVM legs on the CBL-Mariner images, but run the AOTing st…
jkoritzinsky Apr 24, 2023
542b0ad
Fix parameter name
jkoritzinsky Apr 24, 2023
bb2fa99
Treat target parameter as template parameter
jkoritzinsky Apr 24, 2023
9dfe840
Fix typo
jkoritzinsky Apr 24, 2023
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
2 changes: 1 addition & 1 deletion eng/pipelines/common/templates/pipeline-with-resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ resources:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-gcc12-amd64

- container: linux_x64_llvmaot
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8

- container: browser_wasm
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly-net8-20230327150025-4404b5c
Expand Down
3 changes: 3 additions & 0 deletions eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ parameters:
nativeAotTest: false
runtimeFlavor: 'mono'
runtimeVariant: 'monointerpreter'
llvmAotStepContainer: ''
scenarios:
- normal
variables: {}
Expand Down Expand Up @@ -57,9 +58,11 @@ steps:
- ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}:
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }}
displayName: "LLVM AOT compile CoreCLR tests"
target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }}
- ${{ if eq(parameters.runtimeVariant, 'llvmfullaot') }}:
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }}
displayName: "LLVM AOT compile CoreCLR tests"
target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }}
- ${{ if eq(parameters.archType, 'arm64') }}:
- ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}:
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }} $(_monoAotCrossCompileArg) /p:RuntimeVariant=llvmfullaot -maxcpucount:2
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ jobs:
extraStepsTemplate: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
extraStepsParameters:
creator: dotnet-bot
llvmAotStepContainer: linux_x64_llvmaot
testRunNamePrefixSuffix: Mono_Release
extraVariablesTemplates:
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/runtime-llvm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ extends:
buildConfig: release
runtimeFlavor: mono
platforms:
- linux_x64
- linux_x64_llvmaot
# Disabled pending outcome of https://github.com/dotnet/runtime/issues/60234 investigation
#- linux_arm64
helixQueueGroup: pr
Expand All @@ -202,7 +202,7 @@ extends:
buildConfig: release
runtimeFlavor: mono
platforms:
- linux_x64
- linux_x64_llvmaot
- linux_arm64
helixQueueGroup: pr
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
Expand Down
3 changes: 2 additions & 1 deletion eng/pipelines/runtime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@ extends:
buildConfig: Release
runtimeFlavor: mono
platforms:
- linux_x64_llvmaot
- linux_x64
# Disabled pending outcome of https://github.com/dotnet/runtime/issues/60234 investigation
#- linux_arm64
variables:
Expand All @@ -1233,6 +1233,7 @@ extends:
extraStepsTemplate: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
extraStepsParameters:
creator: dotnet-bot
llvmAotStepContainer: linux_x64_llvmaot
testRunNamePrefixSuffix: Mono_Release
extraVariablesTemplates:
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
Expand Down