Skip to content
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

Jump to bottom

evaluate-default-paths.yml: Add paths for wasi #81817

Merged
merged 8 commits into from
Feb 9, 2023
Merged

evaluate-default-paths.yml: Add paths for wasi #81817

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a9f9bfd
evaluate-default-paths.yml: Add paths for wasi
radical Feb 8, 2023
5c3f1cc
disable runtime-wasm-optional automatic trigger for PRs
radical Feb 8, 2023
7bd5157
CI: skip debugger tests on runtime-wasm if they run on runtime pipeline
radical Feb 8, 2023
1167328
fix condition
radical Feb 8, 2023
4d686f1
address review feedback from @kg
radical Feb 8, 2023
eebd001
Merge remote-tracking branch 'origin/main' into ci-more-fixes
radical Feb 8, 2023
e3275cf
Fix yml issue
radical Feb 8, 2023
e787ad4
fix syntax error in yml
radical Feb 8, 2023
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
7 changes: 6 additions & 1 deletion eng/pipelines/common/evaluate-default-paths.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@ parameters:
_const_paths:
_wasm_specific_only: [
eng/testing/ProvisioningVersions.props
eng/testing/Was*Runner*
Copy link
Member

Choose a reason for hiding this comment

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

(m|i) instead of *?

Copy link
Member

Choose a reason for hiding this comment

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

or use ? to be clear that it's one character

Copy link
Member

Choose a reason for hiding this comment

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

with the caveat that i don't know what kind of glob/regex syntax is being used here :-)

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed. these are used with git diff, and follow git pathspec.

Copy link
Member Author

Choose a reason for hiding this comment

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

hmph azdo didn't like ?: /eng/pipelines/common/evaluate-default-paths.yml (Line: 10, Col: 24): While parsing a flow sequence, did not find expected ',' or ']'.

Copy link
Member Author

Choose a reason for hiding this comment

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

Took the easy way out with WasmRunner*, and WasiRunner.

eng/testing/scenarios/BuildWasmAppsJobsList.txt
eng/testing/tests.wasm.targets
eng/testing/tests.browser.targets
eng/testing/tests.was*.targets
eng/testing/was*provisioning.targets
src/libraries/sendtohelix-wasm.targets
src/libraries/sendtohelix-wasi.targets
src/mono/mono/**/*wasm*
src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/*
src/mono/nuget/Microsoft.NET.Runtime.wasm.Sample.Mono/*
Expand Down Expand Up @@ -70,6 +74,7 @@ jobs:
- eng/pipelines/installer/*
- eng/pipelines/mono/*
- eng/pipelines/libraries/*
- ${{ parameters._const_paths._wasm_specific_only }}
- ${{ parameters._const_paths._wasm_pipelines }}
- ${{ parameters._const_paths._always_exclude }}

Expand Down
7 changes: 6 additions & 1 deletion eng/pipelines/common/templates/wasm-debugger-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
isWasmOnlyBuild: false
browser: 'chrome'
shouldContinueOnError: false
runOnlyOnWasmPipelines: false
Copy link
Member

Choose a reason for hiding this comment

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

I'm confused as to why this would want to run on non-wasm pipelines. Are the wasm debugger tests not a wasm pipeline?

Copy link
Member Author

Choose a reason for hiding this comment

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

it should really be named runOnlyOnWasmOnlyPipelines or such!

Copy link
Member Author

Choose a reason for hiding this comment

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

So, it should run only on runtime-wasm* pipelines which have only wasm builds, and are run manually.

extraBuildArgs: ''
nameSuffix: ''
platforms: []
Expand All @@ -23,6 +24,8 @@ jobs:
# map dependencies variables to local variables
- name: alwaysRunVar
value: ${{ parameters.alwaysRun }}
- name: runOnlyOnWasmPipelinesVar
value: ${{ parameters.runOnlyOnWasmPipelines }}
- name: shouldRunOnDefaultPipelines
value: $[
or(
Expand All @@ -47,7 +50,9 @@ jobs:
condition: >-
or(
eq(variables['alwaysRunVar'], true),
eq(variables['isDefaultPipeline'], variables['shouldRunOnDefaultPipelines']))
and(
eq(variables['isDefaultPipeline'], variables['shouldRunOnDefaultPipelines']),
ne(variables['runOnlyOnWasmPipelinesVar']), 'true'))
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
extraStepsParameters:
creator: dotnet-bot
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ jobs:
alwaysRun: ${{ parameters.isWasmOnlyBuild }}
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
runOnlyOnWasmPipelines: true

# Disable for now
#- template: /eng/pipelines/coreclr/perf-wasm-jobs.yml
Expand Down
5 changes: 1 addition & 4 deletions eng/pipelines/runtime-wasm-optional.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# This is a wrapper yml for `extra-platforms/runtime-extra-platforms-wasm.yml`, which
# has all the wasm jobs. This file is essentially so we can have point
# the pipeline in azdo UI to this, and thus avoid any scheduled triggers

trigger: none
pr: none

variables:
- template: /eng/pipelines/common/variables.yml
Expand Down