Skip to content

Commit b635536

Browse files
author
Nathan Ricci
authored
Revert removal of clr dependency from mono builds (#62788)
This partially reverts this change: #62652 The problem is that although we no longer need to patch, we do need corerun from the clr.hosts subset. Corerun still ends up as part of the pubished clr product artifact, and not in the mono product artifact. And thus we still end up downloading clr, and still need this dependency for now.
1 parent 0e7fe23 commit b635536

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

eng/pipelines/common/templates/runtimes/run-test-job.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ jobs:
6464
- ${{ if notIn(parameters.testGroup, 'innerloop', 'clrinterpreter') }}:
6565
- '${{ parameters.runtimeFlavor }}_common_test_build_p1_AnyOS_AnyCPU_${{parameters.buildConfig }}'
6666
- ${{ if ne(parameters.stagedBuild, true) }}:
67+
- ${{ if or( eq(parameters.runtimeVariant, 'minijit'), eq(parameters.runtimeVariant, 'monointerpreter'), eq(parameters.runtimeVariant, 'llvmaot'), eq(parameters.runtimeVariant, 'llvmfullaot')) }}:
68+
# This is needed for creating a CORE_ROOT in the current design.
69+
- ${{ format('coreclr_{0}_product_build_{1}{2}_{3}_{4}', '', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
6770
- ${{ if or( eq(parameters.runtimeVariant, 'minijit'), eq(parameters.runtimeVariant, 'monointerpreter')) }} :
6871
# minijit and mono interpreter runtimevariants do not require any special build of the runtime
6972
- ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, '', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

0 commit comments

Comments
 (0)