File tree Expand file tree Collapse file tree 3 files changed +34
-1
lines changed Expand file tree Collapse file tree 3 files changed +34
-1
lines changed Original file line number Diff line number Diff line change @@ -271,7 +271,10 @@ jobs:
271271 fi
272272
273273 if [[ -n "${{ parameters.crossRootFs }}" ]]; then
274- customEnvVars="$customEnvVars ROOTFS_DIR=${{ parameters.crossRootFs}} CROSSCOMPILE=1"
274+ customEnvVars="$customEnvVars ROOTFS_DIR=${{ parameters.crossRootFs}}"
275+ if [[ '${{ parameters.targetArchitecture }}' != 'wasm' ]]; then
276+ customEnvVars="$customEnvVars CROSSCOMPILE=1"
277+ fi
275278 fi
276279
277280 if [[ ! -z '${{ parameters.targetOS }}' ]]; then
Original file line number Diff line number Diff line change @@ -345,6 +345,20 @@ stages:
345345 targetOS : windows
346346 targetArchitecture : x64
347347
348+ - template : ../jobs/vmr-build.yml
349+ parameters :
350+ buildName : Browser_Shortstack
351+ isBuiltFromVmr : ${{ parameters.isBuiltFromVmr }}
352+ vmrBranch : ${{ variables.VmrBranch }}
353+ architecture : wasm
354+ pool :
355+ name : ${{ variables.defaultPoolName }}
356+ demands : ${{ variables.defaultPoolDemandsLinux }}
357+ container : ${{ variables.wasmCrossContainer }}
358+ crossRootFs : ' /crossrootfs/x64'
359+ targetOS : browser
360+ targetArchitecture : wasm
361+
348362 - template : ../jobs/vmr-build.yml
349363 parameters :
350364 buildName : iOSSimulator_Shortstack
@@ -457,6 +471,20 @@ stages:
457471 targetOS : tvossimulator
458472 targetArchitecture : x64
459473
474+ - template : ../jobs/vmr-build.yml
475+ parameters :
476+ buildName : Wasi_Shortstack
477+ isBuiltFromVmr : ${{ parameters.isBuiltFromVmr }}
478+ vmrBranch : ${{ variables.VmrBranch }}
479+ architecture : wasm
480+ pool :
481+ name : ${{ variables.defaultPoolName }}
482+ demands : ${{ variables.defaultPoolDemandsLinux }}
483+ container : ${{ variables.wasmCrossContainer }}
484+ crossRootFs : ' /crossrootfs/x64'
485+ targetOS : wasi
486+ targetArchitecture : wasm
487+
460488 - template : ../jobs/vmr-build.yml
461489 parameters :
462490 buildName : OSX
Original file line number Diff line number Diff line change @@ -28,6 +28,8 @@ variables:
2828 value : mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64
2929- name : androidCrossContainer
3030 value : mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-android-amd64
31+ - name : wasmCrossContainer
32+ value : mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly-20230917141449-2aaa02c
3133
3234- ${{ if eq(variables['System.TeamProject'], 'public') }} :
3335 - name : defaultPoolName
You can’t perform that action at this time.
0 commit comments