Skip to content

[VMR] Add basic WASM CI #18573

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

Merged
merged 9 commits into from
Feb 9, 2024
Merged

[VMR] Add basic WASM CI #18573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
be827c7
Add basic wasm CI
directhex Feb 8, 2024
243880c
Temporarily force full build
directhex Feb 8, 2024
4b5fbb5
Merge branch 'main' into CI-webs
directhex Feb 8, 2024
66924e3
Don't set CROSSCOMPILE=1 for wasm targets, they are special cased in …
directhex Feb 8, 2024
cd5f41b
typo
Feb 8, 2024
efab88a
Revert "Temporarily force full build"
Feb 8, 2024
48cd213
Move a wasm job to always-run
Feb 8, 2024
e186093
Merge branch 'main' into CI-webs
directhex Feb 8, 2024
0599766
Merge branch 'main' into CI-webs
directhex Feb 8, 2024
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
5 changes: 4 additions & 1 deletion eng/pipelines/templates/jobs/vmr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,10 @@ jobs:
fi

if [[ -n "${{ parameters.crossRootFs }}" ]]; then
customEnvVars="$customEnvVars ROOTFS_DIR=${{ parameters.crossRootFs}} CROSSCOMPILE=1"
customEnvVars="$customEnvVars ROOTFS_DIR=${{ parameters.crossRootFs}}"
if [[ '${{ parameters.targetArchitecture }}' != 'wasm' ]]; then
customEnvVars="$customEnvVars CROSSCOMPILE=1"
fi
Copy link
Member

@akoeplinger akoeplinger Feb 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

which issues does setting CROSSCOMPILE cause on wasm?

Copy link
Author

@directhex directhex Feb 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's some logic in gen-buildsys i think which sees CROSSCOMPILE=1 and does a build for $BuildOS-$TargetArch instead of $TargetOS-$TargetArch, something like that, anyway it fails on "linux-wasm isn't a thing"

Copy link
Member

@akoeplinger akoeplinger Feb 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, would you mind filing an issue for this? I'd rather fix this in runtime than hardcoding this logic in the VMR (it's fine for now).

fi

if [[ ! -z '${{ parameters.targetOS }}' ]]; then
Expand Down
28 changes: 28 additions & 0 deletions eng/pipelines/templates/stages/vmr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,20 @@ stages:
targetOS: windows
targetArchitecture: x64

- template: ../jobs/vmr-build.yml
parameters:
buildName: Browser_Shortstack
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: wasm
pool:
name: ${{ variables.defaultPoolName }}
demands: ${{ variables.defaultPoolDemandsLinux }}
container: ${{ variables.wasmCrossContainer }}
crossRootFs: '/crossrootfs/x64'
targetOS: browser
targetArchitecture: wasm

- template: ../jobs/vmr-build.yml
parameters:
buildName: iOSSimulator_Shortstack
Expand Down Expand Up @@ -457,6 +471,20 @@ stages:
targetOS: tvossimulator
targetArchitecture: x64

- template: ../jobs/vmr-build.yml
parameters:
buildName: Wasi_Shortstack
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: wasm
pool:
name: ${{ variables.defaultPoolName }}
demands: ${{ variables.defaultPoolDemandsLinux }}
container: ${{ variables.wasmCrossContainer }}
crossRootFs: '/crossrootfs/x64'
targetOS: wasi
targetArchitecture: wasm

- template: ../jobs/vmr-build.yml
parameters:
buildName: OSX
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/templates/variables/vmr-stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ variables:
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64
- name: androidCrossContainer
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-android-amd64
- name: wasmCrossContainer
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly-20230917141449-2aaa02c
Copy link
Member

@akoeplinger akoeplinger Feb 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we pinned this version because of some issue in runtime but we should get back to the floating tag ASAP, do you know if we have an issue?

Copy link
Author

@directhex directhex Feb 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know, I just pulled what was in my runtime checkout. I'll ask someone from the wasm team tomorrow

Copy link
Member

@lewing lewing Feb 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dotnet/runtime#92243 was the last time it was touched. IIRC there was some issue with mariner and the libc for one of the wasm deps??


- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: defaultPoolName
Expand Down