Skip to content

Commit fa4f15e

Browse files
jkoritzinskyjkoritzinsky
authored
Update to use the cbl-mariner webassembly images. (#86806)
1 parent 6ea11b5 commit fa4f15e

File tree

11 files changed

+74
-47
lines changed

11 files changed

+74
-47
lines changed

‎eng/pipelines/common/templates/pipeline-with-resources.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,14 @@ resources:
8585
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
8686

8787
- container: browser_wasm
88-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly-net8
88+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly
89+
env:
90+
ROOTFS_DIR: /crossrootfs/x64
8991

9092
- container: wasi_wasm
91-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-webassembly-net8
93+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly
94+
env:
95+
ROOTFS_DIR: /crossrootfs/x64
9296

9397
- container: freebsd_x64
9498
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-freebsd-12

‎eng/pipelines/common/templates/wasm-build-tests.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ parameters:
44
isWasmOnlyBuild: false
55
platforms: []
66
shouldContinueOnError: false
7+
extraBuildArgs: ''
78

89
jobs:
910

@@ -39,7 +40,7 @@ jobs:
3940
isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
4041
testGroup: innerloop
4142
nameSuffix: WasmBuildTests
42-
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:TestWasmBuildTests=true /p:TestAssemblies=false /p:BrowserHost=$(_hostedOs) /p:WorkloadsTestPreviousVersions=$(workloadsTestPreviousVersionsVar)
43+
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:TestWasmBuildTests=true /p:TestAssemblies=false /p:BrowserHost=$(_hostedOs) /p:WorkloadsTestPreviousVersions=$(workloadsTestPreviousVersionsVar) ${{ parameters.extraBuildArgs }}
4344
timeoutInMinutes: 180
4445
condition: >-
4546
or(

‎eng/pipelines/common/templates/wasm-runtime-tests.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ parameters:
33
isExtraPlatformsBuild: false
44
isWasmOnlyBuild: false
55
platforms: []
6+
extraBuildArgs: ''
67

78
jobs:
89

@@ -35,7 +36,7 @@ jobs:
3536
isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
3637
nameSuffix: AllSubsets_Mono_RuntimeTests
3738
runtimeVariant: monointerpreter
38-
buildArgs: -s mono+libs -c $(_BuildConfig)
39+
buildArgs: -s mono+libs -c $(_BuildConfig) ${{ parameters.extraBuildArgs }}
3940
timeoutInMinutes: 180
4041
condition: >-
4142
or(

‎eng/pipelines/coreclr/perf-wasm-jobs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
platforms:
2323
- browser_wasm
2424
jobParameters:
25-
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
25+
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
2626
nameSuffix: wasm
2727
isOfficialBuild: false
2828
extraStepsTemplate: /eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml
@@ -89,7 +89,7 @@ jobs:
8989
platforms:
9090
- browser_wasm
9191
jobParameters:
92-
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
92+
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
9393
nameSuffix: wasm
9494
isOfficialBuild: false
9595
extraStepsTemplate: /eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml

‎eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
- browser_wasm
2828
- browser_wasm_win
2929
nameSuffix: _AOT
30+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
3031
runAOT: true
3132
alwaysRun: true
3233

@@ -37,7 +38,7 @@ jobs:
3738
- browser_wasm
3839
- browser_wasm_win
3940
nameSuffix: _HighResource_AOT
40-
extraBuildArgs: /p:TestAssemblies=false /p:RunHighAOTResourceRequiringTestsOnly=true
41+
extraBuildArgs: /p:TestAssemblies=false /p:RunHighAOTResourceRequiringTestsOnly=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
4142
buildAOTOnHelix: false
4243
runAOT: true
4344
alwaysRun: true
@@ -48,6 +49,7 @@ jobs:
4849
platforms:
4950
- browser_wasm_firefox
5051
browser: firefox
52+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
5153
## ff tests are unstable currently
5254
shouldContinueOnError: true
5355
alwaysRun: true
@@ -71,6 +73,7 @@ jobs:
7173
platforms:
7274
- browser_wasm
7375
# Don't run for rolling builds, as this is covered
76+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
7477
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
7578
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
7679
scenarios:
@@ -83,6 +86,7 @@ jobs:
8386
platforms:
8487
- browser_wasm
8588
nameSuffix: _NodeJs
89+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
8690
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
8791
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
8892
alwaysRun: ${{ parameters.isWasmOnlyBuild }}
@@ -108,7 +112,7 @@ jobs:
108112
- browser_wasm
109113
#- browser_wasm_win
110114
nameSuffix: _Threading_Smoke
111-
extraBuildArgs: /p:MonoWasmBuildVariant=multithread /p:_WasmPThreadPoolSize=8
115+
extraBuildArgs: /p:MonoWasmBuildVariant=multithread /p:_WasmPThreadPoolSize=8 /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
112116
shouldRunSmokeOnly: true
113117
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
114118
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
@@ -124,7 +128,7 @@ jobs:
124128
- browser_wasm
125129
#- browser_wasm_win
126130
nameSuffix: _Threading
127-
extraBuildArgs: /p:MonoWasmBuildVariant=multithread /p:_WasmPThreadPoolSize=8
131+
extraBuildArgs: /p:MonoWasmBuildVariant=multithread /p:_WasmPThreadPoolSize=8 /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
128132
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
129133
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
130134
# Always run for runtime-wasm because tests are not run in runtime
@@ -144,7 +148,7 @@ jobs:
144148
- browser_wasm
145149
#- browser_wasm_win
146150
nameSuffix: _Threading_PerfTracing
147-
extraBuildArgs: /p:MonoWasmBuildVariant=perftrace
151+
extraBuildArgs: /p:MonoWasmBuildVariant=perftrace /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
148152
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
149153
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
150154
# Always run for runtime-wasm because tests are not run in runtime
@@ -163,6 +167,7 @@ jobs:
163167
platforms:
164168
- browser_wasm
165169
nameSuffix: _EAT
170+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
166171
runAOT: false
167172
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
168173
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
@@ -174,6 +179,7 @@ jobs:
174179
- browser_wasm
175180
- browser_wasm_win
176181
nameSuffix: _AOT
182+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
177183
runAOT: true
178184
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
179185
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
@@ -186,7 +192,7 @@ jobs:
186192
- browser_wasm
187193
- browser_wasm_win
188194
nameSuffix: _HighResource_AOT
189-
extraBuildArgs: /p:TestAssemblies=false /p:RunHighAOTResourceRequiringTestsOnly=true
195+
extraBuildArgs: /p:TestAssemblies=false /p:RunHighAOTResourceRequiringTestsOnly=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
190196
buildAOTOnHelix: false
191197
runAOT: true
192198
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
@@ -200,7 +206,7 @@ jobs:
200206
- wasi_wasm
201207
- wasi_wasm_win
202208
nameSuffix: '_Smoke'
203-
extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true
209+
extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
204210
shouldRunSmokeOnly: true
205211
# ignore test failures for runtime-extra-platforms, but not when this
206212
# is run as part of a wasm specific pipeline like runtime-wasm
@@ -218,13 +224,15 @@ jobs:
218224
- browser_wasm_win
219225
- wasi_wasm
220226
- wasi_wasm_win
227+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
221228
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
222229
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
223230

224231
- template: /eng/pipelines/common/templates/wasm-runtime-tests.yml
225232
parameters:
226233
platforms:
227234
- browser_wasm
235+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
228236
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
229237
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
230238

@@ -235,6 +243,7 @@ jobs:
235243
platforms:
236244
- browser_wasm
237245
- browser_wasm_win
246+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
238247
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
239248
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
240249

@@ -243,6 +252,7 @@ jobs:
243252
platforms:
244253
- browser_wasm_firefox
245254
browser: firefox
255+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
246256
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
247257
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
248258
alwaysRun: ${{ parameters.isWasmOnlyBuild }}
@@ -254,7 +264,7 @@ jobs:
254264
platforms:
255265
- Browser_wasm
256266
- Browser_wasm_win
257-
extraBuildArgs: /p:MonoWasmBuildVariant=multithread /p:WasmEnableThreads=true
267+
extraBuildArgs: /p:MonoWasmBuildVariant=multithread /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
258268
nameSuffix: DebuggerTests_MultiThreaded
259269
alwaysRun: ${{ parameters.isWasmOnlyBuild }}
260270
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
@@ -273,7 +283,7 @@ jobs:
273283
platforms:
274284
- wasi_wasm
275285
- wasi_wasm_win
276-
extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true
286+
extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
277287
# always run for wasm only pipelines
278288
alwaysRun: ${{ parameters.isWasmOnlyBuild }}
279289
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}

‎eng/pipelines/runtime-linker-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ extends:
118118
testGroup: innerloop
119119
timeoutInMinutes: 120
120120
nameSuffix: Runtime_Release
121-
buildArgs: -s mono+libs -c $(_BuildConfig) -p:WasmBuildNative=false
121+
buildArgs: -s mono+libs -c $(_BuildConfig) -p:WasmBuildNative=false -p:AotHostArchitecture=x64 -p:AotHostOS=$(_hostedOS)
122122
condition:
123123
or(
124124
eq(variables['isRollingBuild'], true),

‎eng/pipelines/runtime.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ extends:
422422
platforms:
423423
- browser_wasm
424424
alwaysRun: ${{ variables.isRollingBuild }}
425+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
425426
scenarios:
426427
- normal
427428
- WasmTestOnBrowser
@@ -431,6 +432,7 @@ extends:
431432
platforms:
432433
- browser_wasm_win
433434
alwaysRun: ${{ variables.isRollingBuild }}
435+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
434436
scenarios:
435437
- WasmTestOnBrowser
436438

@@ -443,6 +445,7 @@ extends:
443445
runAOT: false
444446
shouldRunSmokeOnly: false
445447
alwaysRun: ${{ variables.isRollingBuild }}
448+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
446449

447450
# AOT Library tests
448451
- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
@@ -453,6 +456,7 @@ extends:
453456
runAOT: true
454457
shouldRunSmokeOnly: true
455458
alwaysRun: ${{ variables.isRollingBuild }}
459+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
456460

457461
- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
458462
parameters:
@@ -470,6 +474,7 @@ extends:
470474
- browser_wasm
471475
- browser_wasm_win
472476
alwaysRun: ${{ variables.isRollingBuild }}
477+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
473478

474479
# Wasm Debugger tests
475480
- template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
@@ -478,21 +483,23 @@ extends:
478483
- browser_wasm
479484
- browser_wasm_win
480485
alwaysRun: ${{ variables.isRollingBuild }}
486+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
481487

482488
# Wasm runtime tests
483489
- template: /eng/pipelines/common/templates/wasm-runtime-tests.yml
484490
parameters:
485491
platforms:
486492
- browser_wasm
487493
alwaysRun: ${{ variables.isRollingBuild }}
494+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
488495

489496
# Build and Smoke Tests only - Wasm Threading Legs
490497
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
491498
parameters:
492499
platforms:
493500
- browser_wasm
494501
nameSuffix: _Threading_Smoke
495-
extraBuildArgs: /p:MonoWasmBuildVariant=multithread /p:_WasmPThreadPoolSize=8
502+
extraBuildArgs: /p:MonoWasmBuildVariant=multithread /p:_WasmPThreadPoolSize=8 /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
496503
shouldRunSmokeOnly: true
497504
alwaysRun: ${{ variables.isRollingBuild }}
498505
scenarios:
@@ -503,7 +510,7 @@ extends:
503510
platforms:
504511
- browser_wasm
505512
nameSuffix: _Threading_PerfTracing
506-
extraBuildArgs: /p:MonoWasmBuildVariant=perftrace
513+
extraBuildArgs: /p:MonoWasmBuildVariant=perftrace /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
507514
alwaysRun: ${{ variables.isRollingBuild }}
508515

509516
# WASI/WASM
@@ -514,7 +521,7 @@ extends:
514521
- wasi_wasm
515522
- wasi_wasm_win
516523
nameSuffix: '_Smoke'
517-
extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true
524+
extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
518525
shouldContinueOnError: true
519526
shouldRunSmokeOnly: true
520527
alwaysRun: ${{ variables.isRollingBuild }}
@@ -526,6 +533,7 @@ extends:
526533
platforms:
527534
- wasi_wasm
528535
- wasi_wasm_win
536+
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
529537
alwaysRun: ${{ variables.isRollingBuild }}
530538

531539
#

‎src/mono/llvm/llvm-init.proj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
Version="$(MonoLLVMToolsVersion)"
1818
PackageArch="$(TargetArchitecture)"
1919
Condition="'$(TargetArchitecture)' != ''" />
20-
<PackageReference Include="runtime.$(MonoLLVMHostOS)-$(RealTargetArchitecture).Microsoft.NETCore.Runtime.Mono.LLVM.Tools"
20+
<PackageReference Include="runtime.$(MonoLLVMHostOS)-$(AotHostArchitecture).Microsoft.NETCore.Runtime.Mono.LLVM.Tools"
2121
Version="$(MonoLLVMToolsVersion)"
22-
PackageArch="$(RealTargetArchitecture)"
23-
Condition="'$(RealTargetArchitecture)' != ''" />
22+
PackageArch="$(AotHostArchitecture)"
23+
Condition="'$(AotHostArchitecture)' != ''" />
2424
<PackageReference Include="runtime.$(MonoLLVMHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Mono.LLVM.Tools"
2525
Version="$(MonoLLVMToolsVersion)"
2626
PackageArch="$(BuildArchitecture)"
@@ -29,10 +29,10 @@
2929
Version="$(MonoLLVMSDKVersion)"
3030
PackageArch="$(TargetArchitecture)"
3131
Condition="'$(TargetArchitecture)' != ''" />
32-
<PackageReference Include="runtime.$(MonoLLVMHostOS)-$(RealTargetArchitecture).Microsoft.NETCore.Runtime.Mono.LLVM.Sdk"
32+
<PackageReference Include="runtime.$(MonoLLVMHostOS)-$(AotHostArchitecture).Microsoft.NETCore.Runtime.Mono.LLVM.Sdk"
3333
Version="$(MonoLLVMSDKVersion)"
34-
PackageArch="$(RealTargetArchitecture)"
35-
Condition="'$(RealTargetArchitecture)' != ''" />
34+
PackageArch="$(AotHostArchitecture)"
35+
Condition="'$(AotHostArchitecture)' != ''" />
3636
<PackageReference Include="runtime.$(MonoLLVMHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Mono.LLVM.Sdk"
3737
Version="$(MonoLLVMSDKVersion)"
3838
PackageArch="$(BuildArchitecture)"

0 commit comments

Comments
 (0)