Skip to content

Commit 467fef4

Browse files
lewingradical
lewing
and
radical
authored
[wasm] Bump the NoTargets version (#75397)
* 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 <[email protected]>
1 parent 3b2f038 commit 467fef4

9 files changed

+72
-30
lines changed

‎eng/pipelines/common/evaluate-default-paths.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ parameters:
1717
src/tasks/WasmAppBuilder/*
1818
src/tasks/WasmBuildTasks/*
1919
src/tasks/WorkloadBuildTasks/*
20+
src/tests/Common/wasm-test-runner/*
21+
]
22+
_wasm_pipelines: [
23+
eng/pipelines/*wasm*
24+
eng/pipelines/common/templates/*wasm*
25+
eng/pipelines/common/templates/runtime/wasm*
26+
eng/pipelines/coreclr/*wasm*
2027
]
2128

2229
jobs:
@@ -45,6 +52,7 @@ jobs:
4552
- eng/pipelines/mono/*
4653
- eng/pipelines/libraries/*
4754
- eng/pipelines/common/evaluate-default-paths.yml
55+
- ${{ parameters._const_paths._wasm_pipelines }}
4856

4957
- subset: mono_excluding_wasm
5058
include:
@@ -54,6 +62,7 @@ jobs:
5462
- src/native/libs/System.IO.Compression.Native/*
5563
exclude:
5664
- ${{ parameters._const_paths._wasm_specific_only }}
65+
- ${{ parameters._const_paths._wasm_pipelines }}
5766

5867
- eng/Version.Details.xml
5968
- '*.md'
@@ -88,10 +97,21 @@ jobs:
8897
- eng/pipelines/mono/*
8998
- eng/pipelines/installer/*
9099
- eng/pipelines/common/evaluate-default-paths.yml
100+
- ${{ parameters._const_paths._wasm_pipelines }}
91101

92102
- subset: runtimetests
93103
include:
94104
- src/tests/*
105+
106+
- subset: non_runtimetests
107+
exclude:
108+
- src/tests/*
109+
- ${{ parameters._const_paths._wasm_pipelines }}
110+
111+
# having this ensures that change in evaluate-default-paths.yml
112+
# doesn't trigger jobs
113+
- eng/pipelines/common/evaluate-default-paths.yml
114+
95115
- subset: installer
96116
include:
97117
- docs/manpages/*
@@ -111,6 +131,7 @@ jobs:
111131
- eng/pipelines/mono/*
112132
- eng/pipelines/libraries/*
113133
- eng/pipelines/common/evaluate-default-paths.yml
134+
- ${{ parameters._const_paths._wasm_pipelines }}
114135

115136
# We have limited Apple Silicon testing capacity
116137
# We want PR testing on a narrower set of changes
@@ -174,6 +195,11 @@ jobs:
174195
exclude:
175196
- src/mono/wasm/Wasm.Build.Tests/*
176197
- src/mono/wasm/debugger/*
198+
- ${{ parameters._const_paths._wasm_pipelines }}
199+
200+
# having this ensures that change in evaluate-default-paths.yml
201+
# doesn't trigger jobs
202+
- eng/pipelines/common/evaluate-default-paths.yml
177203

178204
- subset: wasm_wbt_or_dbg
179205
include:
@@ -211,6 +237,7 @@ jobs:
211237
- subset: non_wasm
212238
exclude:
213239
- ${{ parameters._const_paths._wasm_specific_only }}
240+
- ${{ parameters._const_paths._wasm_pipelines }}
214241

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

224252
- eng/testing/tests.mobile.targets
225253
- src/mono/*
@@ -231,5 +259,9 @@ jobs:
231259
- src/tasks/WasmBuildTasks/*
232260
- src/tasks/WorkloadBuildTasks/*
233261

262+
# having this ensures that change in evaluate-default-paths.yml
263+
# doesn't trigger jobs
264+
- eng/pipelines/common/evaluate-default-paths.yml
265+
234266
- ${{ if ne(parameters.extraSubsets, '') }}:
235267
- ${{ parameters.extraSubsets }}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ jobs:
2626
or(
2727
eq(variables['wasmDarcDependenciesChanged'], true),
2828
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
29-
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true),
29+
and(
30+
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true),
31+
eq(dependencies.evaluate_paths.outputs['SetPathVars_non_runtimetests.containsChange'], true)),
3032
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm_libraries.containsChange'], true),
3133
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true))
3234
]

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ jobs:
3838
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
3939
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
4040
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm_libraries.containsChange'], true),
41-
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true))))
41+
and(
42+
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true),
43+
eq(dependencies.evaluate_paths.outputs['SetPathVars_non_runtimetests.containsChange'], true)))))
4244
]
4345
- name: onlyWBTOrDbgTestHaveChanges
4446
value:

‎eng/pipelines/common/variables.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,10 @@ variables:
4141
ne(variables['isExtraPlatformsBuild'], true),
4242
eq(variables['isRollingBuild'], true))) ]
4343

44+
- name: nonWasmRuntimeTestsContainsChange
45+
value:
46+
and(
47+
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
48+
ne(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true))
49+
4450
- template: /eng/pipelines/common/perf-variables.yml

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ jobs:
469469
condition: >-
470470
or(
471471
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
472-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
472+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
473473
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
474474
eq(variables['isRollingBuild'], true))
475475
@@ -488,7 +488,7 @@ jobs:
488488
condition: >-
489489
or(
490490
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
491-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
491+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
492492
eq(variables['isRollingBuild'], true))
493493
494494
#
@@ -521,7 +521,7 @@ jobs:
521521
condition: >-
522522
or(
523523
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
524-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
524+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
525525
eq(variables['isRollingBuild'], true))
526526
# extra steps, run tests
527527
extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
@@ -559,7 +559,7 @@ jobs:
559559
runtimeVariant: monointerpreter
560560
condition: >-
561561
or(
562-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
562+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
563563
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
564564
eq(variables['isRollingBuild'], true))
565565
# extra steps, run tests
@@ -597,7 +597,7 @@ jobs:
597597
timeoutInMinutes: 240
598598
condition: >-
599599
or(
600-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
600+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
601601
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
602602
eq(variables['isRollingBuild'], true))
603603
# don't run tests on PRs until we can get significantly more devices
@@ -629,7 +629,7 @@ jobs:
629629
condition: >-
630630
or(
631631
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
632-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
632+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
633633
eq(variables['isRollingBuild'], true))
634634
635635
#
@@ -652,5 +652,5 @@ jobs:
652652
condition: >-
653653
or(
654654
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
655-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
655+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
656656
eq(variables['isRollingBuild'], true))

‎eng/pipelines/runtime-llvm.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
runtimeVariant: llvmaot
160160
condition: >-
161161
or(
162-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
162+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
163163
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
164164
eq(variables['isRollingBuild'], true))
165165
@@ -186,7 +186,7 @@ jobs:
186186
condition: >-
187187
or(
188188
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
189-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
189+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
190190
eq(variables['isRollingBuild'], true))
191191
192192
#
@@ -211,5 +211,5 @@ jobs:
211211
condition: >-
212212
or(
213213
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
214-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
214+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
215215
eq(variables['isRollingBuild'], true))

‎eng/pipelines/runtime-staging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
timeoutInMinutes: 240
8888
condition: >-
8989
or(
90-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
90+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
9191
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
9292
eq(variables['isRollingBuild'], true))
9393
${{ if eq(variables['isRollingBuild'], true) }}:

‎eng/pipelines/runtime.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
condition: >-
9595
or(
9696
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
97-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
97+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
9898
eq(variables['isRollingBuild'], true))
9999
100100
#
@@ -117,7 +117,7 @@ jobs:
117117
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
118118
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
119119
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
120-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
120+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
121121
eq(variables['isRollingBuild'], true))
122122
123123
#
@@ -136,7 +136,7 @@ jobs:
136136
or(
137137
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
138138
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
139-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
139+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
140140
eq(variables['isRollingBuild'], true))
141141
142142
#
@@ -210,7 +210,7 @@ jobs:
210210
condition: >-
211211
or(
212212
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
213-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
213+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
214214
eq(variables['isFullMatrix'], true))
215215
216216
#
@@ -232,7 +232,7 @@ jobs:
232232
condition: >-
233233
or(
234234
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
235-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
235+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
236236
eq(variables['isFullMatrix'], true))
237237
238238
#
@@ -256,7 +256,7 @@ jobs:
256256
condition: >-
257257
or(
258258
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
259-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
259+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
260260
eq(variables['isFullMatrix'], true))
261261
262262
#
@@ -750,7 +750,7 @@ jobs:
750750
condition: >-
751751
or(
752752
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
753-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
753+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
754754
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
755755
eq(variables['isRollingBuild'], true))
756756
@@ -770,7 +770,7 @@ jobs:
770770
runtimeVariant: llvmaot
771771
condition: >-
772772
or(
773-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
773+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
774774
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
775775
eq(variables['isRollingBuild'], true))
776776
@@ -938,7 +938,7 @@ jobs:
938938
condition: >-
939939
or(
940940
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
941-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
941+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
942942
eq(variables['isRollingBuild'], true))
943943
944944
#
@@ -961,7 +961,7 @@ jobs:
961961
condition: >-
962962
or(
963963
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
964-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
964+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
965965
eq(variables['isRollingBuild'], true))
966966
967967
- template: /eng/pipelines/common/platform-matrix.yml
@@ -981,7 +981,7 @@ jobs:
981981
condition: >-
982982
or(
983983
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
984-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
984+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
985985
eq(variables['isRollingBuild'], true))
986986
987987
- template: /eng/pipelines/common/platform-matrix.yml
@@ -1015,7 +1015,7 @@ jobs:
10151015
condition: >-
10161016
or(
10171017
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
1018-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
1018+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
10191019
eq(variables['isRollingBuild'], true))
10201020
10211021
#
@@ -1039,7 +1039,7 @@ jobs:
10391039
condition: >-
10401040
or(
10411041
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
1042-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
1042+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
10431043
eq(variables['isRollingBuild'], true))
10441044
10451045
#
@@ -1062,7 +1062,7 @@ jobs:
10621062
condition: >-
10631063
or(
10641064
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
1065-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
1065+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
10661066
eq(variables['isRollingBuild'], true))
10671067
#
10681068
# Mono CoreCLR runtime Test executions using live libraries and LLVM AOT
@@ -1087,7 +1087,7 @@ jobs:
10871087
condition: >-
10881088
or(
10891089
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
1090-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
1090+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
10911091
eq(variables['isRollingBuild'], true))
10921092
10931093
#
@@ -1112,7 +1112,7 @@ jobs:
11121112
condition: >-
11131113
or(
11141114
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
1115-
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
1115+
eq(variables['nonWasmRuntimeTestsContainsChange'], true),
11161116
eq(variables['isRollingBuild'], true))
11171117
11181118
#

‎src/tests/Common/wasm-test-runner/WasmTestRunner.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- This project requires an explicit SDK version number because it is used on Helix,
22
and global.json is not available. -->
3-
<Project Sdk="Microsoft.Build.NoTargets/1.0.53" DefaultTargets="WasmBuildApp">
3+
<Project Sdk="Microsoft.Build.NoTargets/3.5.0" DefaultTargets="WasmBuildApp">
44
<Import Project="$(CORE_ROOT)\build\WasmApp.InTree.props" />
55
<PropertyGroup>
66
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>

0 commit comments

Comments
 (0)