Skip to content

Commit

Permalink
[wasm] Bump the NoTargets version (#75397)
Browse files Browse the repository at this point in the history
* Bump the NoTargets version

* Update src/tests/Common/wasm-test-runner/WasmTestRunner.proj

* Update src/tests/Common/wasm-test-runner/WasmTestRunner.proj

* evaluate-default-paths: add wasm-test-runner to wasm_specific_only subset, so it doesn't trigger non-wasm jobs

* CI: update triggers

- wasm library tests, and build-only should be triggered by wasm changes
  only if there are non-runtime-tests changes, be runtimetest only
  changes already trigger the corresponding job

* CI: don't trigger non-wasm jobs based on wasm pipeline changes

* CI: don't trigger coreclr, or mono jobs based on only wasm-runtime tests changes

* fix

* fix yml .

Co-authored-by: Ankit Jain <radical@gmail.com>
  • Loading branch information
lewing and radical committed Sep 12, 2022
1 parent 3b2f038 commit 467fef4
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 30 deletions.
32 changes: 32 additions & 0 deletions eng/pipelines/common/evaluate-default-paths.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ parameters:
src/tasks/WasmAppBuilder/*
src/tasks/WasmBuildTasks/*
src/tasks/WorkloadBuildTasks/*
src/tests/Common/wasm-test-runner/*
]
_wasm_pipelines: [
eng/pipelines/*wasm*
eng/pipelines/common/templates/*wasm*
eng/pipelines/common/templates/runtime/wasm*
eng/pipelines/coreclr/*wasm*
]

jobs:
Expand Down Expand Up @@ -45,6 +52,7 @@ jobs:
- eng/pipelines/mono/*
- eng/pipelines/libraries/*
- eng/pipelines/common/evaluate-default-paths.yml
- ${{ parameters._const_paths._wasm_pipelines }}

- subset: mono_excluding_wasm
include:
Expand All @@ -54,6 +62,7 @@ jobs:
- src/native/libs/System.IO.Compression.Native/*
exclude:
- ${{ parameters._const_paths._wasm_specific_only }}
- ${{ parameters._const_paths._wasm_pipelines }}

- eng/Version.Details.xml
- '*.md'
Expand Down Expand Up @@ -88,10 +97,21 @@ jobs:
- eng/pipelines/mono/*
- eng/pipelines/installer/*
- eng/pipelines/common/evaluate-default-paths.yml
- ${{ parameters._const_paths._wasm_pipelines }}

- subset: runtimetests
include:
- src/tests/*

- subset: non_runtimetests
exclude:
- src/tests/*
- ${{ parameters._const_paths._wasm_pipelines }}

# having this ensures that change in evaluate-default-paths.yml
# doesn't trigger jobs
- eng/pipelines/common/evaluate-default-paths.yml

- subset: installer
include:
- docs/manpages/*
Expand All @@ -111,6 +131,7 @@ jobs:
- eng/pipelines/mono/*
- eng/pipelines/libraries/*
- eng/pipelines/common/evaluate-default-paths.yml
- ${{ parameters._const_paths._wasm_pipelines }}

# We have limited Apple Silicon testing capacity
# We want PR testing on a narrower set of changes
Expand Down Expand Up @@ -174,6 +195,11 @@ jobs:
exclude:
- src/mono/wasm/Wasm.Build.Tests/*
- src/mono/wasm/debugger/*
- ${{ parameters._const_paths._wasm_pipelines }}

# having this ensures that change in evaluate-default-paths.yml
# doesn't trigger jobs
- eng/pipelines/common/evaluate-default-paths.yml

- subset: wasm_wbt_or_dbg
include:
Expand Down Expand Up @@ -211,6 +237,7 @@ jobs:
- subset: non_wasm
exclude:
- ${{ parameters._const_paths._wasm_specific_only }}
- ${{ parameters._const_paths._wasm_pipelines }}

# having this ensures that change in evaluate-default-paths.yml won't
# trigger non-onlywasm jobs
Expand All @@ -220,6 +247,7 @@ jobs:
- subset: non_mono_and_wasm
exclude:
- ${{ parameters._const_paths._wasm_specific_only }}
- ${{ parameters._const_paths._wasm_pipelines }}

- eng/testing/tests.mobile.targets
- src/mono/*
Expand All @@ -231,5 +259,9 @@ jobs:
- src/tasks/WasmBuildTasks/*
- src/tasks/WorkloadBuildTasks/*

# having this ensures that change in evaluate-default-paths.yml
# doesn't trigger jobs
- eng/pipelines/common/evaluate-default-paths.yml

- ${{ if ne(parameters.extraSubsets, '') }}:
- ${{ parameters.extraSubsets }}
4 changes: 3 additions & 1 deletion eng/pipelines/common/templates/wasm-build-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ jobs:
or(
eq(variables['wasmDarcDependenciesChanged'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true),
and(
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_non_runtimetests.containsChange'], true)),
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm_libraries.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true))
]
Expand Down
4 changes: 3 additions & 1 deletion eng/pipelines/common/templates/wasm-library-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ jobs:
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm_libraries.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true))))
and(
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_non_runtimetests.containsChange'], true)))))
]
- name: onlyWBTOrDbgTestHaveChanges
value:
Expand Down
6 changes: 6 additions & 0 deletions eng/pipelines/common/variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,10 @@ variables:
ne(variables['isExtraPlatformsBuild'], true),
eq(variables['isRollingBuild'], true))) ]

- name: nonWasmRuntimeTestsContainsChange
value:
and(
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
ne(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true))

- template: /eng/pipelines/common/perf-variables.yml
14 changes: 7 additions & 7 deletions eng/pipelines/runtime-extra-platforms-other.yml
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(variables['isRollingBuild'], true))
Expand All @@ -488,7 +488,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
#
Expand Down Expand Up @@ -521,7 +521,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
# extra steps, run tests
extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
Expand Down Expand Up @@ -559,7 +559,7 @@ jobs:
runtimeVariant: monointerpreter
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(variables['isRollingBuild'], true))
# extra steps, run tests
Expand Down Expand Up @@ -597,7 +597,7 @@ jobs:
timeoutInMinutes: 240
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(variables['isRollingBuild'], true))
# don't run tests on PRs until we can get significantly more devices
Expand Down Expand Up @@ -629,7 +629,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
#
Expand All @@ -652,5 +652,5 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
6 changes: 3 additions & 3 deletions eng/pipelines/runtime-llvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
runtimeVariant: llvmaot
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(variables['isRollingBuild'], true))
Expand All @@ -186,7 +186,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
#
Expand All @@ -211,5 +211,5 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
2 changes: 1 addition & 1 deletion eng/pipelines/runtime-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
timeoutInMinutes: 240
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(variables['isRollingBuild'], true))
${{ if eq(variables['isRollingBuild'], true) }}:
Expand Down
32 changes: 16 additions & 16 deletions eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
#
Expand All @@ -117,7 +117,7 @@ jobs:
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
#
Expand All @@ -136,7 +136,7 @@ jobs:
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
#
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isFullMatrix'], true))
#
Expand All @@ -232,7 +232,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isFullMatrix'], true))
#
Expand All @@ -256,7 +256,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isFullMatrix'], true))
#
Expand Down Expand Up @@ -750,7 +750,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(variables['isRollingBuild'], true))
Expand All @@ -770,7 +770,7 @@ jobs:
runtimeVariant: llvmaot
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(variables['isRollingBuild'], true))
Expand Down Expand Up @@ -938,7 +938,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
#
Expand All @@ -961,7 +961,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
- template: /eng/pipelines/common/platform-matrix.yml
Expand All @@ -981,7 +981,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
- template: /eng/pipelines/common/platform-matrix.yml
Expand Down Expand Up @@ -1015,7 +1015,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
#
Expand All @@ -1039,7 +1039,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
#
Expand All @@ -1062,7 +1062,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
#
# Mono CoreCLR runtime Test executions using live libraries and LLVM AOT
Expand All @@ -1087,7 +1087,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
#
Expand All @@ -1112,7 +1112,7 @@ jobs:
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
eq(variables['isRollingBuild'], true))
#
Expand Down
2 changes: 1 addition & 1 deletion src/tests/Common/wasm-test-runner/WasmTestRunner.proj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- This project requires an explicit SDK version number because it is used on Helix,
and global.json is not available. -->
<Project Sdk="Microsoft.Build.NoTargets/1.0.53" DefaultTargets="WasmBuildApp">
<Project Sdk="Microsoft.Build.NoTargets/3.5.0" DefaultTargets="WasmBuildApp">
<Import Project="$(CORE_ROOT)\build\WasmApp.InTree.props" />
<PropertyGroup>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
Expand Down

0 comments on commit 467fef4

Please sign in to comment.