Skip to content

Commit 56749c5

Browse files
[release/8.0] Fix LLVMAOT Mono runtime variant official build to produce correctly named runtime packs (#92737)
* Fix LLVMAOT Mono runtime variant official build to produce correctly named runtime packs In 75ee623 the condition in src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props got changed from checking `MonoBundleLLVMOptimizer` to `MonoAOTEnableLLVM` but we weren't setting that property in runtime-official.yml so both jobs produced runtime packs with the same suffix, resulting in the artifact uploads randomly overwriting each other. * Fix more places that need MonoAOTEnableLLVM=true --------- Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
1 parent 8c898a9 commit 56749c5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

eng/pipelines/runtime-llvm.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ extends:
119119
testGroup: innerloop
120120
nameSuffix: AllSubsets_Mono_LLVMAOT
121121
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
122-
/p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
122+
/p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
123123
condition: >-
124124
or(
125125
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -138,7 +138,7 @@ extends:
138138
testGroup: innerloop
139139
nameSuffix: AllSubsets_Mono_LLVMAOT
140140
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
141-
/p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
141+
/p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
142142
condition: >-
143143
or(
144144
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),

eng/pipelines/runtime-official.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ extends:
334334
runtimeFlavor: mono
335335
jobParameters:
336336
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
337-
/p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
337+
/p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
338338
nameSuffix: AllSubsets_Mono_LLVMAOT
339339
runtimeVariant: LLVMAOT
340340
isOfficialBuild: ${{ variables.isOfficialBuild }}

eng/pipelines/runtime.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ extends:
780780
testGroup: innerloop
781781
nameSuffix: AllSubsets_Mono_LLVMAOT
782782
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
783-
/p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
783+
/p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
784784
condition: >-
785785
or(
786786
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -799,7 +799,7 @@ extends:
799799
testGroup: innerloop
800800
nameSuffix: AllSubsets_Mono_LLVMAOT
801801
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
802-
/p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
802+
/p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
803803
condition: >-
804804
or(
805805
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -1318,7 +1318,7 @@ extends:
13181318
testGroup: innerloop
13191319
nameSuffix: AllSubsets_Mono_LLVMAot_RuntimeTests
13201320
runtimeVariant: llvmaot
1321-
buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
1321+
buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release /p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
13221322
timeoutInMinutes: 180
13231323

13241324
condition: >-

0 commit comments

Comments
 (0)