From 5a9819f8f8837b739d94521e3887e79eb626027f Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 31 Aug 2022 05:31:38 -0400 Subject: [PATCH 01/15] CI: move isDefaultPipeline to variables.yml --- eng/pipelines/common/templates/wasm-build-only.yml | 10 ---------- eng/pipelines/common/templates/wasm-build-tests.yml | 10 ---------- eng/pipelines/common/templates/wasm-debugger-tests.yml | 10 ---------- eng/pipelines/common/templates/wasm-library-tests.yml | 10 ---------- eng/pipelines/common/templates/wasm-runtime-tests.yml | 10 ---------- eng/pipelines/common/variables.yml | 7 +++++++ 6 files changed, 7 insertions(+), 50 deletions(-) diff --git a/eng/pipelines/common/templates/wasm-build-only.yml b/eng/pipelines/common/templates/wasm-build-only.yml index 761de04536d07..32e17588a5292 100644 --- a/eng/pipelines/common/templates/wasm-build-only.yml +++ b/eng/pipelines/common/templates/wasm-build-only.yml @@ -27,16 +27,6 @@ jobs: value: ${{ parameters.alwaysRun }} - name: allWasmContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'] ] - - name: isDefaultPipeline - # default pipeline, so not runtime-wasm, and not - # runtime-extra-platforms+rolling build - value: ${{ - and( - ne(parameters.isWasmOnlyBuild, true), - or( - ne(parameters.isExtraPlatformsBuild, true), - eq(variables['isRollingBuild'], true))) - }} - name: shouldRunOnDefaultPipelines value: $[ or( diff --git a/eng/pipelines/common/templates/wasm-build-tests.yml b/eng/pipelines/common/templates/wasm-build-tests.yml index 7ce2176f19a84..07c253ed80bf1 100644 --- a/eng/pipelines/common/templates/wasm-build-tests.yml +++ b/eng/pipelines/common/templates/wasm-build-tests.yml @@ -26,16 +26,6 @@ jobs: value: $[ dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'] ] - name: alwaysRunVar value: ${{ parameters.alwaysRun }} - - name: isDefaultPipeline - # default pipeline, so not runtime-wasm, and not - # runtime-extra-platforms+rolling build - value: ${{ - and( - ne(parameters.isWasmOnlyBuild, true), - or( - ne(parameters.isExtraPlatformsBuild, true), - eq(variables['isRollingBuild'], true))) - }} - name: shouldRunOnDefaultPipelines value: $[ or( diff --git a/eng/pipelines/common/templates/wasm-debugger-tests.yml b/eng/pipelines/common/templates/wasm-debugger-tests.yml index 2bd104a659203..29e29e2a6aa27 100644 --- a/eng/pipelines/common/templates/wasm-debugger-tests.yml +++ b/eng/pipelines/common/templates/wasm-debugger-tests.yml @@ -25,16 +25,6 @@ jobs: value: $[ dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'] ] - name: alwaysRunVar value: ${{ parameters.alwaysRun }} - - name: isDefaultPipeline - # default pipeline, so not runtime-wasm, and not - # runtime-extra-platforms+rolling build - value: ${{ - and( - ne(parameters.isWasmOnlyBuild, true), - or( - ne(parameters.isExtraPlatformsBuild, true), - eq(variables['isRollingBuild'], true))) - }} - name: shouldRunOnDefaultPipelines value: $[ or( diff --git a/eng/pipelines/common/templates/wasm-library-tests.yml b/eng/pipelines/common/templates/wasm-library-tests.yml index f96ca8aa1aabe..9981d8727a85c 100644 --- a/eng/pipelines/common/templates/wasm-library-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-tests.yml @@ -34,16 +34,6 @@ jobs: value: ${{ parameters.alwaysRun }} - name: allWasmContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'] ] - - name: isDefaultPipeline - # default pipeline, so not runtime-wasm, and not - # runtime-extra-platforms+rolling build - value: ${{ - and( - ne(parameters.isWasmOnlyBuild, true), - or( - ne(parameters.isExtraPlatformsBuild, true), - eq(variables['isRollingBuild'], true))) - }} - name: shouldRunOnDefaultPipelines value: $[ or( diff --git a/eng/pipelines/common/templates/wasm-runtime-tests.yml b/eng/pipelines/common/templates/wasm-runtime-tests.yml index b244949340241..9c728bbc70e74 100644 --- a/eng/pipelines/common/templates/wasm-runtime-tests.yml +++ b/eng/pipelines/common/templates/wasm-runtime-tests.yml @@ -25,16 +25,6 @@ jobs: value: 10 - name: timeoutPerTestCollectionInMinutes value: 200 - - name: isDefaultPipeline - # default pipeline, so not runtime-wasm, and not - # runtime-extra-platforms+!rolling build - value: ${{ - and( - ne(parameters.isWasmOnlyBuild, true), - or( - ne(parameters.isExtraPlatformsBuild, true), - eq(variables['isRollingBuild'], true))) - }} - name: shouldRunOnDefaultPipelines value: $[ or( diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index ea0836fc80244..f9ee74b601b86 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -34,4 +34,11 @@ variables: ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: value: Debug +- name: isDefaultPipeline + value: $[ and( + ne(variables['isWasmOnlyBuild'], true), + or( + ne(variables['isExtraPlatformsBuild'], true), + eq(variables['isRollingBuild'], true))) ] + - template: /eng/pipelines/common/perf-variables.yml From 0688e042d891a5dba1bb09fa5829145e16b7c6c1 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 31 Aug 2022 05:33:53 -0400 Subject: [PATCH 02/15] CI: add support for running wasm jobs as only libtests, and only non-libtests --- eng/pipelines/common/variables.yml | 8 ++++---- eng/pipelines/common/xplat-setup.yml | 2 +- .../runtime-extra-platforms-wasm.yml | 5 ++++- eng/pipelines/runtime-wasm-libtests.yml | 19 +++++++++++++++++++ eng/pipelines/runtime-wasm-non-libtests.yml | 19 +++++++++++++++++++ 5 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 eng/pipelines/runtime-wasm-libtests.yml create mode 100644 eng/pipelines/runtime-wasm-non-libtests.yml diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index f9ee74b601b86..0798b9fcd2e58 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -18,16 +18,16 @@ variables: - name: isNotExtraPlatformsBuild value: ${{ ne(variables['Build.DefinitionName'], 'runtime-extra-platforms') }} - name: isWasmOnlyBuild - value: ${{ eq(variables['Build.DefinitionName'], 'runtime-wasm') }} + value: ${{ in(variables['Build.DefinitionName'], 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests') }} - name: isRunSmokeTestsOnly - value: ${{ and(ne(variables['Build.DefinitionName'], 'runtime-extra-platforms'), ne(variables['Build.DefinitionName'], 'runtime-wasm')) }} + value: ${{ notin(variables['Build.DefinitionName'], 'runtime-extra-platforms', 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests') }} - name: isNotSpecificPlatformOnlyBuild - value: ${{ ne(variables['Build.DefinitionName'], 'runtime-wasm') }} + value: ${{ notin(variables['Build.DefinitionName'], 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests') }} # We only run evaluate paths on runtime, runtime-staging and runtime-community pipelines on PRs # keep in sync with /eng/pipelines/common/xplat-setup.yml - name: dependOnEvaluatePaths - value: ${{ and(eq(variables['Build.Reason'], 'PullRequest'), in(variables['Build.DefinitionName'], 'runtime', 'runtime-staging', 'runtime-community', 'runtime-extra-platforms', 'runtime-wasm')) }} + value: ${{ and(eq(variables['Build.Reason'], 'PullRequest'), in(variables['Build.DefinitionName'], 'runtime', 'runtime-staging', 'runtime-community', 'runtime-extra-platforms', 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'dotnet-linker-tests', 'runtime-dev-innerloop')) }} - name: debugOnPrReleaseOnRolling ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: value: Release diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 9d91ccd891da3..53c43c02ce88d 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -18,7 +18,7 @@ jobs: shouldContinueOnError: ${{ or(eq(parameters.shouldContinueOnError, true), and(ne(parameters.shouldContinueOnError, 'forceFalse'), endsWith(variables['Build.DefinitionName'], 'staging'), eq(variables['Build.Reason'], 'PullRequest'))) }} # keep in sync with /eng/pipelines/common/variables.yml - dependOnEvaluatePaths: ${{ and(eq(variables['Build.Reason'], 'PullRequest'), in(variables['Build.DefinitionName'], 'runtime', 'runtime-staging', 'runtime-community', 'runtime-extra-platforms', 'runtime-wasm')) }} + dependOnEvaluatePaths: ${{ and(eq(variables['Build.Reason'], 'PullRequest'), in(variables['Build.DefinitionName'], 'runtime', 'runtime-staging', 'runtime-community', 'runtime-extra-platforms', 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'dotnet-linker-tests', 'runtime-dev-innerloop')) }} variables: # Disable component governance in our CI builds. These builds are not shipping nor diff --git a/eng/pipelines/runtime-extra-platforms-wasm.yml b/eng/pipelines/runtime-extra-platforms-wasm.yml index 26152f51cf3a4..60d0105dedcc5 100644 --- a/eng/pipelines/runtime-extra-platforms-wasm.yml +++ b/eng/pipelines/runtime-extra-platforms-wasm.yml @@ -7,6 +7,8 @@ parameters: isExtraPlatformsBuild: false isWasmOnlyBuild: false isRollingBuild: false + excludeLibTests: false + excludeNonLibTests: false jobs: @@ -60,7 +62,7 @@ jobs: # - run everything, if relevant paths changed # - For runtime-wasm, force run all the jobs # -- ${{ if ne(parameters.isRollingBuild, true) }}: +- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeLibTests, true)) }}: # Library tests # these run on runtime also - template: /eng/pipelines/common/templates/wasm-library-tests.yml @@ -174,6 +176,7 @@ jobs: isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} alwaysRun: ${{ parameters.isWasmOnlyBuild }} +- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true)) }}: # Wasm.Build.Tests - template: /eng/pipelines/common/templates/wasm-build-tests.yml parameters: diff --git a/eng/pipelines/runtime-wasm-libtests.yml b/eng/pipelines/runtime-wasm-libtests.yml new file mode 100644 index 0000000000000..573dc4f333858 --- /dev/null +++ b/eng/pipelines/runtime-wasm-libtests.yml @@ -0,0 +1,19 @@ +trigger: none + +variables: + - template: /eng/pipelines/common/variables.yml + +jobs: + +# +# Evaluate paths +# +- template: /eng/pipelines/common/evaluate-default-paths.yml + +- template: /eng/pipelines/runtime-extra-platforms-wasm.yml + parameters: + isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} + isWasmOnlyBuild: ${{ variables.isWasmOnlyBuild }} + isRollingBuild: ${{ variables.isRollingBuild }} + excludeNonLibTests: true + excludeLibTests: false diff --git a/eng/pipelines/runtime-wasm-non-libtests.yml b/eng/pipelines/runtime-wasm-non-libtests.yml new file mode 100644 index 0000000000000..c4f5e43c3b62a --- /dev/null +++ b/eng/pipelines/runtime-wasm-non-libtests.yml @@ -0,0 +1,19 @@ +trigger: none + +variables: + - template: /eng/pipelines/common/variables.yml + +jobs: + +# +# Evaluate paths +# +- template: /eng/pipelines/common/evaluate-default-paths.yml + +- template: /eng/pipelines/runtime-extra-platforms-wasm.yml + parameters: + isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} + isWasmOnlyBuild: ${{ variables.isWasmOnlyBuild }} + isRollingBuild: ${{ variables.isRollingBuild }} + excludeNonLibTests: false + excludeLibTests: true From 7cf965a9962dc0b4e5f84eee8e2f7247b3309725 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 31 Aug 2022 06:09:22 -0400 Subject: [PATCH 03/15] Update README with CI matrix for wasm --- src/mono/wasm/README.md | 78 ++++++++++++++++++++++++++--------------- 1 file changed, 50 insertions(+), 28 deletions(-) diff --git a/src/mono/wasm/README.md b/src/mono/wasm/README.md index f8e2344fbf329..221fce0e52b61 100644 --- a/src/mono/wasm/README.md +++ b/src/mono/wasm/README.md @@ -230,38 +230,60 @@ npm update ### How do I know which jobs run on CI, and when? ## PR: -* `runtime-extra-platforms`, and `runtime-wasm` run only when manually triggered with a comment - `/azp run ` -* `runtime`, and `runtime-staging`, run jobs only when relevant paths change. And for `EAT`, and `AOT`, only smoke tests are run. -* And when `runtime-wasm` is triggered manually, it runs *all* the wasm jobs completely - -| . | runtime | runtime-staging | runtime-extra-platforms(manual only) | runtime-wasm (manual only) | -| ----------------- | -------------------- | --------------- | ------------------------------------ | ------- | -| libtests | linux: all, only-pc | windows: all, only-pc | linux+windows: all, only-pc | linux+windows: all, always | -| libtests eat | linux: smoke, only-pc | - | linux: all, only-pc | linux: all, always | -| libtests aot | linux: smoke, only-pc | windows: smoke, only-pc | linux+windows: all, only-pc | linux+windows: all, always | -| high resource aot | none | none | linux+windows: all, only-pc | linux+windows: all, always | -| Wasm.Build.Tests | linux: only-pc | windows: only-pc | linux+windows: only-pc | linux+windows | -| Debugger tests | - | linux+windows: only-pc | linux+windows: only-pc | linux+windows | -| Runtime tests | linux: only-pc | - | linux: only-pc | linux | +* `only-pc` means `only on relevant path changes` + +### Run by default + +* `runtime` runs jobs only when relevant paths change. And for `AOT`, only smoke tests are run. + +| . | runtime | +| ----------------- | -------------------- | +| libtests | linux+windows: all, only-pc | +| libtests eat | linux+windows: smoke, only-pc | +| libtests aot | linux+windows: smoke, only-pc | +| high resource aot | none | +| Wasm.Build.Tests | linux+windows: only-pc | +| Debugger tests | linux+windows: only-pc | +| Runtime tests | linux+windows: only-pc | + + +### Run manually with `/azp run ..` + +* `runtime-wasm*` pipelines are triggered manually, and they only run the jobs that would not run on any default pipelines based on path changes. +* The `AOT` jobs run only smoke tests on `runtime`, and on `runtime-wasm*` pipelines all the `AOT` tests are run. + +| . | runtime-wasm | runtime-wasm-libtests | runtime-wasm-non-libtests | +| ----------------- | -------------------------- | -------------------- | -------------------- | +| libtests | linux+windows: all | linux+windows: all | none | +| libtests eat | linux: all | linux: all | none | +| libtests aot | linux+windows: all | linux+windows: all | none | +| high resource aot | linux+windows: all | linux+windows: all | none | +| Wasm.Build.Tests | linux+windows | none | linux+windows | +| Debugger tests | linux+windows | none | linux+windows | +| Runtime tests | linux | none | linux | +| Perftrace | linux: all tests | linux: all tests | none | +| Multi-thread | linux: all tests | linux: all tests | none | + +* `runtime-extra-platforms` does not run any wasm jobs on PRs * `high resource aot` runs a few specific library tests with AOT, that require more memory to AOT. ## Rolling build (twice a day): -* `runtime`, and `runtime-staging`, run all the wasm jobs unconditionally, but `EAT`, and `AOT` still run only smoke tests. -* `runtime-extra-platforms` also runs by default. And it runs only the cases not covered by the above two pipelines. - -* jobs w/o `only-pc` are always run - -| . | runtime | runtime-staging | runtime-extra-platforms (always run) | runtime-wasm (manual only) | -| ----------------- | ------------- | --------------- | ------------------------------------ | ------ | -| libtests | linux: all(v8/chr) | windows: all | none | N/A | -| libtests eat | linux: smoke | - | linux: all | | -| libtests aot | linux: smoke | windows: smoke | linux+windows: all | | -| high resource aot | none | none | linux+windows: all | | -| | | | | | -| Wasm.Build.Tests | linux: always | windows: always | none | | -| Debugger tests | - | linux+windows: always | none | | -| Runtime tests | linux: always | - | none | | +* `runtime` runs all the wasm jobs, but `AOT` still only runs smoke tests. +* `runtime-extra-platforms` also runs by default. And it runs only the cases not covered by `runtime`. + +| . | runtime | runtime-extra-platforms (always run) | +| ----------------- | ------------- | ------------------------------------ | +| libtests | linux+windows: all | none | +| libtests eat | linux: all | none | +| libtests aot | linux+windows: smoke | linux+windows: all | +| high resource aot | none | linux+windows: all | +| | | | +| Wasm.Build.Tests | linux+windows | none | +| Debugger tests | linux+windows | none | +| Runtime tests | linux | none | +| Perftrace | linux: build only | none | +| Multi-thread | linux: build only | none | * `high resource aot` runs a few specific library tests with AOT, that require more memory to AOT. From 4f51e0181df6ac00d87d63bd8b8fb3f303dd8f52 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 31 Aug 2022 12:47:00 -0400 Subject: [PATCH 04/15] [wasm] Fix timeout for runtime tests to 180, which was changed earlier by mistake --- eng/pipelines/common/templates/wasm-runtime-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/common/templates/wasm-runtime-tests.yml b/eng/pipelines/common/templates/wasm-runtime-tests.yml index 9c728bbc70e74..903235e75c102 100644 --- a/eng/pipelines/common/templates/wasm-runtime-tests.yml +++ b/eng/pipelines/common/templates/wasm-runtime-tests.yml @@ -39,6 +39,7 @@ jobs: nameSuffix: AllSubsets_Mono_RuntimeTests runtimeVariant: monointerpreter buildArgs: -s mono+libs -c $(_BuildConfig) + timeoutInMinutes: 180 # if !alwaysRun, then: # if this is runtime-wasm (isWasmOnlyBuild): # - then run only if it would not have run on default pipelines (based From d9a3c536196e090017dab713135e11c8044417fb Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 30 Aug 2022 16:05:51 -0400 Subject: [PATCH 05/15] evaluate-default-paths: update, and rename some subsets, and track changes in ymls --- .../common/evaluate-default-paths.yml | 136 +++++++++++++----- .../common/templates/wasm-debugger-tests.yml | 1 - .../common/templates/wasm-library-tests.yml | 24 ++-- .../common/templates/wasm-runtime-tests.yml | 6 +- eng/pipelines/runtime.yml | 2 + 5 files changed, 116 insertions(+), 53 deletions(-) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 75361e1d2c58f..70a1e8acf022d 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -2,6 +2,23 @@ parameters: extraSubsets: '' + # _* parameters are being used as a const array, + # do not set them when using the template + _const_paths: + _wasm_specific_only: [ + eng/testing/ProvisioningVersions.props + eng/testing/scenarios/BuildWasmAppsJobsList.txt + eng/testing/tests.wasm.targets + src/libraries/sendtohelix-wasm.targets + src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/* + src/mono/nuget/Microsoft.NET.Runtime.wasm.Sample.Mono/* + src/mono/wasi/* + src/mono/wasm/* + src/tasks/WasmAppBuilder/* + src/tasks/WasmBuildTasks/* + src/tasks/WorkloadBuildTasks/* + ] + jobs: - template: /eng/pipelines/common/evaluate-paths-job.yml parameters: @@ -28,6 +45,9 @@ jobs: - eng/pipelines/mono/* - eng/pipelines/libraries/* - eng/pipelines/common/evaluate-default-paths.yml + + # JUST FOR TESTING THIS PR + - eng/pipelines/* - subset: mono include: - src/libraries/System.Private.CoreLib/* @@ -51,6 +71,9 @@ jobs: - eng/pipelines/coreclr/* - eng/pipelines/libraries/* - eng/pipelines/common/evaluate-default-paths.yml + + # JUST FOR TESTING THIS PR + - eng/pipelines/* - subset: libraries exclude: - eng/Version.Details.xml @@ -68,14 +91,12 @@ jobs: - eng/pipelines/mono/* - eng/pipelines/installer/* - eng/pipelines/common/evaluate-default-paths.yml + + # JUST FOR TESTING THIS PR + - eng/pipelines/* - subset: runtimetests include: - src/tests/* - exclude: - # wasm runtime changes will trigger all wasm jobs anyway - - src/mono/wasm/* - - src/mono/wasm/* - - eng/pipelines/common/evaluate-default-paths.yml - subset: installer include: - docs/manpages/* @@ -95,6 +116,9 @@ jobs: - eng/pipelines/mono/* - eng/pipelines/libraries/* - eng/pipelines/common/evaluate-default-paths.yml + + # JUST FOR TESTING THIS PR + - eng/pipelines/* # We have limited Apple Silicon testing capacity # We want PR testing on a narrower set of changes # Specifically runtime directories which are higher risk of @@ -108,61 +132,95 @@ jobs: - src/coreclr/jit/* - src/coreclr/pal/* - src/coreclr/vm/* - exclude: - - '*' - subset: coreclr_jit include: - src/coreclr/jit/* + + # + # ** WASM ** + # Changes in *only* Wasm.Build.Tests, or debugger, are very self-contained, + # so we try to avoid triggering only those relevants tests + # - subset: wasmbuildtests include: - - src/tasks/* - - src/mono/wasm/Directory.Build* - - src/mono/wasm/Wasm.Build.Tests/* - - src/mono/wasm/build/* - - src/mono/wasm/host/* - - src/mono/wasm/runtime/* - - src/mono/wasm/templates/* - - src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/* + - eng/Version.Details.xml + - eng/Versions.props + - eng/testing/scenarios/BuildWasmAppsJobsList.txt + - eng/testing/workloads-testing.targets + - src/libraries/sendtohelix* + - src/mono/mono/* + - src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/* + - src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/* - src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/* - src/mono/nuget/Microsoft.NET.Runtime.wasm.Sample.Mono/* + - src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/* - src/mono/nuget/Microsoft.NETCore.BrowserDebugHost.Transport/* - - src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/* - - src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/* - - src/mono/mono/* - - eng/testing/scenarios/BuildWasmAppsJobsList.txt - - eng/testing/workloads-testing.targets - - eng/Version.Details.xml - - eng/Versions.props + - src/mono/wasm/build/* - src/mono/wasm/emscripten-version.txt - - src/libraries/sendtohelix* - exclude: - - eng/pipelines/common/evaluate-default-paths.yml + - src/mono/wasm/host/* + - src/mono/wasm/runtime/* + - src/mono/wasm/templates/* + - src/mono/wasm/Wasm.Build.Tests/* + - src/tasks/* + - subset: wasmdebuggertests include: - - src/mono/wasm/debugger/* - - src/mono/wasm/runtime/* - - src/mono/wasm/Directory.Build* - - src/mono/wasm/debugger/Wasm.Debugger.Tests/* - eng/testing/ProvisioningVersions.props - src/mono/mono/* + - src/mono/wasm/debugger/* + - src/mono/wasm/runtime/* + + - subset: any_other_than_wasm_wbt_dbg exclude: - - eng/pipelines/common/evaluate-default-paths.yml - - subset: allwasm + - src/mono/wasm/Wasm.Build.Tests/* + - src/mono/wasm/debugger/* + + - subset: wasm_wbt_or_dbg include: - - eng/Version.Details.xml + - src/mono/wasm/Wasm.Build.Tests/* + - src/mono/wasm/debugger/* + + # triggers most of the wasm jobs to run + - subset: wasm + include: + # other paths that should also trigger wasm jobs - src/mono/*.proj - src/mono/Directory.Build* - src/mono/CMakeLists.txt - src/mono/System.Private.CoreLib/* - - src/mono/mono/* - - src/mono/wasm/emscripten-version.txt - - src/mono/wasm/build/* - - src/mono/wasm/data/aot-tests/* - - src/mono/wasm/runtime/* - - src/mono/wasm/test-main.js - - src/mono/wasm/wasm.proj + - ${{ parameters._const_paths._wasm_specific_only }} + + - subset: non_wasm exclude: + - ${{ parameters._const_paths._wasm_specific_only }} + + # having this ensures that change in evaluate-default-paths.yml won't + # trigger non-onlywasm jobs - eng/pipelines/common/evaluate-default-paths.yml + # JUST FOR TESTING THIS PR + - eng/pipelines/* + + # only mono (including wasm) specific changes + - subset: non_mono + exclude: + #- src/tasks/Common/* + - eng/testing/ProvisioningVersions.props + - eng/testing/scenarios/BuildWasmAppsJobsList.txt + - eng/testing/tests.mobile.targets + - eng/testing/tests.wasm.targets + - src/libraries/sendtohelix-wasm.targets + - src/mono/* + - src/tasks/AndroidAppBuilder/* + - src/tasks/AotCompilerTask/* + - src/tasks/AppleAppBuilder/* + - src/tasks/MonoTargetsTasks/* + - src/tasks/WasmAppBuilder/* + - src/tasks/WasmBuildTasks/* + - src/tasks/WorkloadBuildTasks/* + + # JUST FOR TESTING THIS PR + - eng/pipelines/* + - ${{ if ne(parameters.extraSubsets, '') }}: - ${{ parameters.extraSubsets }} diff --git a/eng/pipelines/common/templates/wasm-debugger-tests.yml b/eng/pipelines/common/templates/wasm-debugger-tests.yml index 29e29e2a6aa27..8110158d4d7f8 100644 --- a/eng/pipelines/common/templates/wasm-debugger-tests.yml +++ b/eng/pipelines/common/templates/wasm-debugger-tests.yml @@ -29,7 +29,6 @@ jobs: value: $[ or( eq(variables['wasmDarcDependenciesChanged'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_wasmdebuggertests.containsChange'], true)) ] jobParameters: diff --git a/eng/pipelines/common/templates/wasm-library-tests.yml b/eng/pipelines/common/templates/wasm-library-tests.yml index 9981d8727a85c..f87f66a27d303 100644 --- a/eng/pipelines/common/templates/wasm-library-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-tests.yml @@ -26,22 +26,24 @@ jobs: shouldContinueOnError: ${{ parameters.shouldContinueOnError }} variables: # map dependencies variables to local variables - - name: librariesContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] - name: alwaysRunVar value: ${{ parameters.alwaysRun }} - - name: allWasmContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'] ] - name: shouldRunOnDefaultPipelines value: $[ - or( - eq(variables['wasmDarcDependenciesChanged'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true)) + eq(variables['wasmDarcDependenciesChanged'], true), + and( + ne(variables['onlyWBTOrDbgTestHaveChanges'], true), + or( + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true)))) ] + - name: onlyWBTOrDbgTestHaveChanges + value: + and( + eq(dependencies.evaluate_paths.outputs.SetPathVars_wasm_wbt_or_dbg.containsChange, true), + ne(dependencies.evaluate_paths.outputs.SetPathVars_any_other_than_wasm_wbt_dbg.containsChange, true)) + jobParameters: isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }} testGroup: innerloop diff --git a/eng/pipelines/common/templates/wasm-runtime-tests.yml b/eng/pipelines/common/templates/wasm-runtime-tests.yml index 903235e75c102..e10ba56a47d39 100644 --- a/eng/pipelines/common/templates/wasm-runtime-tests.yml +++ b/eng/pipelines/common/templates/wasm-runtime-tests.yml @@ -28,10 +28,11 @@ jobs: - name: shouldRunOnDefaultPipelines value: $[ or( + eq(variables['alwaysRunVar'], true), eq(variables['wasmDarcDependenciesChanged'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true)) + eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true)) ] jobParameters: testGroup: innerloop @@ -40,6 +41,7 @@ jobs: runtimeVariant: monointerpreter buildArgs: -s mono+libs -c $(_BuildConfig) timeoutInMinutes: 180 + # FIXME: will get triggered by only wbt/dbg changes # if !alwaysRun, then: # if this is runtime-wasm (isWasmOnlyBuild): # - then run only if it would not have run on default pipelines (based diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 9dc55e45cc6b8..1948dcdb3a063 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -308,6 +308,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -664,6 +665,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) From 032623699bef9aabe567eda30f76600f64c4231a Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 30 Aug 2022 16:07:05 -0400 Subject: [PATCH 06/15] Enable evaluate-paths job for runtime-dev-innerloop, and dotnet-linker-tests pipelines --- eng/pipelines/global-build.yml | 10 ++++++++++ eng/pipelines/runtime-linker-tests.yml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml index 83e8580068af5..644b2e66e5b9f 100644 --- a/eng/pipelines/global-build.yml +++ b/eng/pipelines/global-build.yml @@ -25,7 +25,17 @@ pr: - PATENTS.TXT - THIRD-PARTY-NOTICES.TXT +variables: + - template: /eng/pipelines/common/variables.yml + jobs: + +# +# Evaluate paths +# +- ${{ if eq(variables.dependOnEvaluatePaths, true) }}: + - template: /eng/pipelines/common/evaluate-default-paths.yml + # # Build with Release config and Debug runtimeConfiguration # diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml index 770f6cec01e1c..8d79e3c75d15b 100644 --- a/eng/pipelines/runtime-linker-tests.yml +++ b/eng/pipelines/runtime-linker-tests.yml @@ -45,7 +45,17 @@ pr: - PATENTS.TXT - THIRD-PARTY-NOTICES.TXT +variables: + - template: /eng/pipelines/common/variables.yml + jobs: + +# +# Evaluate paths +# +- ${{ if eq(variables.dependOnEvaluatePaths, true) }}: + - template: /eng/pipelines/common/evaluate-default-paths.yml + # # Build Release config vertical for Windows, Linux, Linux musl and OSX # From a37bb2c8b71f3da19f4551b6956ddf9ce0278e83 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 30 Aug 2022 16:14:46 -0400 Subject: [PATCH 07/15] Add conditions for coreclr, and other non-mono jobs --- .../common/evaluate-default-paths.yml | 10 ++--- eng/pipelines/global-build.yml | 42 +++++++++++++++++++ eng/pipelines/runtime-linker-tests.yml | 10 +++++ eng/pipelines/runtime.yml | 22 ++++++++++ 4 files changed, 78 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 70a1e8acf022d..7f01e5840df4f 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -190,6 +190,7 @@ jobs: - src/mono/System.Private.CoreLib/* - ${{ parameters._const_paths._wasm_specific_only }} + # anything other than wasm-specific paths - subset: non_wasm exclude: - ${{ parameters._const_paths._wasm_specific_only }} @@ -201,15 +202,12 @@ jobs: # JUST FOR TESTING THIS PR - eng/pipelines/* - # only mono (including wasm) specific changes + # anything other than mono, or wasm specific paths - subset: non_mono exclude: - #- src/tasks/Common/* - - eng/testing/ProvisioningVersions.props - - eng/testing/scenarios/BuildWasmAppsJobsList.txt + - ${{ parameters._const_paths._wasm_specific_only }} + - eng/testing/tests.mobile.targets - - eng/testing/tests.wasm.targets - - src/libraries/sendtohelix-wasm.targets - src/mono/* - src/tasks/AndroidAppBuilder/* - src/tasks/AotCompilerTask/* diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml index 644b2e66e5b9f..ee1ab01cf5b64 100644 --- a/eng/pipelines/global-build.yml +++ b/eng/pipelines/global-build.yml @@ -52,6 +52,12 @@ jobs: nameSuffix: Runtime_Debug buildArgs: -c release -runtimeConfiguration debug timeoutInMinutes: 90 + condition: + or( + and( + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(variables['isRollingBuild'], true)) # # Build with Release config and runtimeConfiguration with MSBuild generator @@ -67,6 +73,12 @@ jobs: nameSuffix: MSBuild_CMake buildArgs: -c Release -msbuild timeoutInMinutes: 90 + condition: + or( + and( + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(variables['isRollingBuild'], true)) # # Build with Debug config and Release runtimeConfiguration @@ -82,6 +94,12 @@ jobs: nameSuffix: Runtime_Release buildArgs: -c debug -runtimeConfiguration release timeoutInMinutes: 90 + condition: + or( + and( + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(variables['isRollingBuild'], true)) # # Build with RuntimeFlavor only. This exercise code paths where only RuntimeFlavor is @@ -98,6 +116,12 @@ jobs: nameSuffix: RuntimeFlavor_Mono buildArgs: /p:RuntimeFlavor=Mono timeoutInMinutes: 90 + condition: + or( + and( + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(variables['isRollingBuild'], true)) # # Build Mono + Libraries. This exercises the code path where we build libraries without @@ -114,6 +138,12 @@ jobs: nameSuffix: Mono_Libraries buildArgs: -subset mono+libs /p:RuntimeFlavor=Mono timeoutInMinutes: 90 + condition: + or( + and( + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(variables['isRollingBuild'], true)) # # Build Libraries AllConfigurations. This exercises the code path where we build libraries for all @@ -129,6 +159,12 @@ jobs: nameSuffix: Libraries_AllConfigurations buildArgs: -subset libs -allconfigurations timeoutInMinutes: 90 + condition: + or( + and( + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(variables['isRollingBuild'], true)) # # SourceBuild Build @@ -142,3 +178,9 @@ jobs: jobParameters: nameSuffix: SourceBuild timeoutInMinutes: 90 + condition: + or( + and( + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(variables['isRollingBuild'], true)) diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml index 8d79e3c75d15b..1e886ea42b90b 100644 --- a/eng/pipelines/runtime-linker-tests.yml +++ b/eng/pipelines/runtime-linker-tests.yml @@ -71,6 +71,10 @@ jobs: testGroup: innerloop timeoutInMinutes: 120 nameSuffix: Runtime_Release + condition: + or( + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(variables['isRollingBuild'], true)) buildArgs: -s clr+libs -c $(_BuildConfig) extraStepsTemplate: /eng/pipelines/libraries/execute-trimming-tests-steps.yml @@ -88,6 +92,12 @@ jobs: timeoutInMinutes: 120 nameSuffix: Runtime_Release buildArgs: -s mono+libs -c $(_BuildConfig) -p:WasmBuildNative=false + condition: + or( + eq(variables['isRollingBuild'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true)), + eq(dependencies.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_NET_ILLink_Tasks'], true)) extraStepsTemplate: /eng/pipelines/libraries/execute-trimming-tests-steps.yml extraStepsParameters: extraTestArgs: '/p:WasmBuildNative=false' diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 1948dcdb3a063..a0a899dbb40b1 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -155,6 +155,11 @@ jobs: - FreeBSD_x64 jobParameters: testGroup: innerloop + # Don't run these when we have only wasm changes on PRs + condition: + or( + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(variables['isRollingBuild'], true)) # # Build CoreCLR Formatting Job @@ -776,6 +781,11 @@ jobs: - windows_arm - windows_arm64 - windows_x86 + jobParameters: + condition: + or( + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(variables['isRollingBuild'], true)) - template: /eng/pipelines/common/platform-matrix.yml parameters: @@ -791,6 +801,10 @@ jobs: - FreeBSD_x64 jobParameters: testScope: innerloop + condition: + or( + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(variables['isRollingBuild'], true)) # # Libraries debug build that only runs when coreclr is changed @@ -873,6 +887,10 @@ jobs: jobParameters: liveRuntimeBuildConfig: release liveLibrariesBuildConfig: Release + condition: + or( + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(variables['isRollingBuild'], true)) - template: /eng/pipelines/installer/installer-matrix.yml parameters: @@ -888,6 +906,10 @@ jobs: jobParameters: liveRuntimeBuildConfig: release liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} + condition: + or( + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(variables['isRollingBuild'], true)) # # CoreCLR Test builds using live libraries release build From 0cf18c0529bb1c6db87cb0eb8c0169c16d9cd4c7 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 30 Aug 2022 16:43:01 -0400 Subject: [PATCH 08/15] evaluate-default-paths.yml: naming change mono -> mono_excluding_wasm non_mono -> non_mono_and_wasm this helps simplify the conditions, and make it easier to read. --- .../common/evaluate-default-paths.yml | 8 ++- .../common/templates/wasm-build-only.yml | 4 +- eng/pipelines/global-build.yml | 28 +++------ eng/pipelines/runtime-community.yml | 12 ++-- .../runtime-extra-platforms-other.yml | 44 +++++++------- eng/pipelines/runtime-linker-tests.yml | 4 +- eng/pipelines/runtime-llvm.yml | 14 ++--- eng/pipelines/runtime-staging.yml | 2 +- eng/pipelines/runtime.yml | 60 +++++++++---------- 9 files changed, 82 insertions(+), 94 deletions(-) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 7f01e5840df4f..a6d0a0cb78592 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -48,13 +48,16 @@ jobs: # JUST FOR TESTING THIS PR - eng/pipelines/* - - subset: mono + + - subset: mono_excluding_wasm include: - src/libraries/System.Private.CoreLib/* - src/native/libs/Common/* - src/native/libs/System.Globalization.Native/* - src/native/libs/System.IO.Compression.Native/* exclude: + - ${{ parameters._const_paths._wasm_specific_only }} + - eng/Version.Details.xml - '*.md' - LICENSE.TXT @@ -66,7 +69,6 @@ jobs: - src/libraries/* - src/native/libs/* - src/tests/* - - src/mono/wasm/* - eng/pipelines/installer/* - eng/pipelines/coreclr/* - eng/pipelines/libraries/* @@ -203,7 +205,7 @@ jobs: - eng/pipelines/* # anything other than mono, or wasm specific paths - - subset: non_mono + - subset: non_mono_and_wasm exclude: - ${{ parameters._const_paths._wasm_specific_only }} diff --git a/eng/pipelines/common/templates/wasm-build-only.yml b/eng/pipelines/common/templates/wasm-build-only.yml index 32e17588a5292..e74d9469d321c 100644 --- a/eng/pipelines/common/templates/wasm-build-only.yml +++ b/eng/pipelines/common/templates/wasm-build-only.yml @@ -32,8 +32,8 @@ jobs: or( eq(variables['wasmDarcDependenciesChanged'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true)) + eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true)) ] jobParameters: isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }} diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml index ee1ab01cf5b64..1d483990e1930 100644 --- a/eng/pipelines/global-build.yml +++ b/eng/pipelines/global-build.yml @@ -54,9 +54,7 @@ jobs: timeoutInMinutes: 90 condition: or( - and( - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -75,9 +73,7 @@ jobs: timeoutInMinutes: 90 condition: or( - and( - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -96,9 +92,7 @@ jobs: timeoutInMinutes: 90 condition: or( - and( - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -118,9 +112,7 @@ jobs: timeoutInMinutes: 90 condition: or( - and( - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -140,9 +132,7 @@ jobs: timeoutInMinutes: 90 condition: or( - and( - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -161,9 +151,7 @@ jobs: timeoutInMinutes: 90 condition: or( - and( - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -180,7 +168,5 @@ jobs: timeoutInMinutes: 90 condition: or( - and( - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true)), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) diff --git a/eng/pipelines/runtime-community.yml b/eng/pipelines/runtime-community.yml index 3eace877e5522..7b2908c9f7d65 100644 --- a/eng/pipelines/runtime-community.yml +++ b/eng/pipelines/runtime-community.yml @@ -55,7 +55,7 @@ jobs: - name: librariesContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -64,7 +64,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/libraries/helix.yml @@ -93,7 +93,7 @@ jobs: - name: librariesContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] jobParameters: testScope: innerloop nameSuffix: AllSubsets_Mono @@ -102,7 +102,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -121,7 +121,7 @@ jobs: - name: librariesContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] jobParameters: testScope: innerloop nameSuffix: AllSubsets_Mono @@ -130,7 +130,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) ${{ if eq(variables['isRollingBuild'], true) }}: # extra steps, run tests diff --git a/eng/pipelines/runtime-extra-platforms-other.yml b/eng/pipelines/runtime-extra-platforms-other.yml index 983f239077762..95fe8858ba2ba 100644 --- a/eng/pipelines/runtime-extra-platforms-other.yml +++ b/eng/pipelines/runtime-extra-platforms-other.yml @@ -139,7 +139,7 @@ jobs: - name: librariesContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] jobParameters: testScope: innerloop nameSuffix: AllSubsets_Mono @@ -148,7 +148,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests @@ -183,7 +183,7 @@ jobs: - name: librariesContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -192,7 +192,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests @@ -225,7 +225,7 @@ jobs: - name: librariesContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -235,7 +235,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/libraries/helix.yml @@ -267,7 +267,7 @@ jobs: - name: librariesContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -276,7 +276,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests @@ -308,7 +308,7 @@ jobs: - name: librariesContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_AppSandbox @@ -317,7 +317,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/libraries/helix.yml @@ -349,7 +349,7 @@ jobs: - name: librariesContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -358,7 +358,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests @@ -390,7 +390,7 @@ jobs: - name: librariesContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -399,7 +399,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/libraries/helix.yml @@ -444,7 +444,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests @@ -470,7 +470,7 @@ jobs: or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -487,7 +487,7 @@ jobs: testGroup: innerloop condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -520,7 +520,7 @@ jobs: timeoutInMinutes: 240 condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests @@ -560,7 +560,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml @@ -598,7 +598,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], 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 # Turn off the testing for now, until https://github.com/dotnet/runtime/issues/60128 gets resolved @@ -628,7 +628,7 @@ jobs: runtimeVariant: minijit condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -651,6 +651,6 @@ jobs: runtimeVariant: monointerpreter condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isRollingBuild'], true)) diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml index 1e886ea42b90b..2f4dacb8ea714 100644 --- a/eng/pipelines/runtime-linker-tests.yml +++ b/eng/pipelines/runtime-linker-tests.yml @@ -73,7 +73,7 @@ jobs: nameSuffix: Runtime_Release condition: or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) buildArgs: -s clr+libs -c $(_BuildConfig) extraStepsTemplate: /eng/pipelines/libraries/execute-trimming-tests-steps.yml @@ -96,7 +96,7 @@ jobs: or( eq(variables['isRollingBuild'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true)), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true)), eq(dependencies.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_NET_ILLink_Tasks'], true)) extraStepsTemplate: /eng/pipelines/libraries/execute-trimming-tests-steps.yml extraStepsParameters: diff --git a/eng/pipelines/runtime-llvm.yml b/eng/pipelines/runtime-llvm.yml index 0a68de11407d8..9f58d2bab8f60 100644 --- a/eng/pipelines/runtime-llvm.yml +++ b/eng/pipelines/runtime-llvm.yml @@ -77,7 +77,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -97,7 +97,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -120,7 +120,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -139,7 +139,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -160,7 +160,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -185,7 +185,7 @@ jobs: runtimeVariant: llvmaot condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -210,6 +210,6 @@ jobs: runtimeVariant: llvmfullaot condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isRollingBuild'], true)) diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index e4cf2237a7070..9aa56c919a7cd 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -88,7 +88,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) ${{ if eq(variables['isRollingBuild'], true) }}: # extra steps, run tests diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index a0a899dbb40b1..64ce210d6fbb7 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -106,7 +106,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + 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), @@ -158,7 +158,7 @@ jobs: # Don't run these when we have only wasm changes on PRs condition: or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -312,7 +312,7 @@ jobs: isOfficialBuild: ${{ variables.isOfficialBuild }} condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -336,7 +336,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -355,7 +355,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -466,7 +466,7 @@ jobs: - name: librariesContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -475,7 +475,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests @@ -509,7 +509,7 @@ jobs: - name: librariesContainsChange value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -518,7 +518,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests @@ -550,7 +550,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -570,7 +570,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -593,7 +593,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -612,7 +612,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -639,7 +639,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -669,7 +669,7 @@ jobs: - Browser condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -697,7 +697,7 @@ jobs: - MacCatalyst condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -721,7 +721,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -741,7 +741,7 @@ jobs: or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -761,7 +761,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -784,7 +784,7 @@ jobs: jobParameters: condition: or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) - template: /eng/pipelines/common/platform-matrix.yml @@ -803,7 +803,7 @@ jobs: testScope: innerloop condition: or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -889,7 +889,7 @@ jobs: liveLibrariesBuildConfig: Release condition: or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) - template: /eng/pipelines/installer/installer-matrix.yml @@ -908,7 +908,7 @@ jobs: liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} condition: or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -1002,7 +1002,7 @@ jobs: testGroup: innerloop condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -1026,7 +1026,7 @@ jobs: runtimeVariant: minijit condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -1049,7 +1049,7 @@ jobs: runtimeVariant: monointerpreter condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -1074,7 +1074,7 @@ jobs: runtimeVariant: llvmaot condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -1099,7 +1099,7 @@ jobs: runtimeVariant: llvmfullaot condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -1126,7 +1126,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -1152,7 +1152,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # From 513a56ef0851fc0e4c58ac6bb66b9bded3c4fa06 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 30 Aug 2022 16:15:29 -0400 Subject: [PATCH 09/15] cleanup --- eng/pipelines/common/evaluate-changed-paths.yml | 3 ++- eng/pipelines/common/evaluate-paths-job.yml | 1 - eng/pipelines/common/templates/wasm-build-only.yml | 6 ------ eng/pipelines/common/templates/wasm-build-tests.yml | 4 ---- eng/pipelines/common/templates/wasm-debugger-tests.yml | 4 ---- eng/pipelines/common/templates/wasm-runtime-tests.yml | 2 -- 6 files changed, 2 insertions(+), 18 deletions(-) diff --git a/eng/pipelines/common/evaluate-changed-paths.yml b/eng/pipelines/common/evaluate-changed-paths.yml index 28f8490663b66..318063260d8b6 100644 --- a/eng/pipelines/common/evaluate-changed-paths.yml +++ b/eng/pipelines/common/evaluate-changed-paths.yml @@ -12,7 +12,8 @@ parameters: steps: - ${{ if ne(parameters.arguments[0], '') }}: - - script: eng/pipelines/evaluate-changed-paths.sh + - script: >- + eng/pipelines/evaluate-changed-paths.sh --azurevariable containsChange ${{ join(' ', parameters.arguments) }} displayName: Evaluate paths for ${{ parameters.subsetName }} diff --git a/eng/pipelines/common/evaluate-paths-job.yml b/eng/pipelines/common/evaluate-paths-job.yml index 71f35bd4f9f4c..670fba6c0c6e0 100644 --- a/eng/pipelines/common/evaluate-paths-job.yml +++ b/eng/pipelines/common/evaluate-paths-job.yml @@ -24,7 +24,6 @@ parameters: # This example will include ALL path changes under src/libraries/ except the ones under src/libraries/*!System.Private.CoreLib/* paths: [] - jobs: - job: evaluate_paths displayName: Evaluate Paths diff --git a/eng/pipelines/common/templates/wasm-build-only.yml b/eng/pipelines/common/templates/wasm-build-only.yml index e74d9469d321c..a84ce107d02f2 100644 --- a/eng/pipelines/common/templates/wasm-build-only.yml +++ b/eng/pipelines/common/templates/wasm-build-only.yml @@ -19,14 +19,8 @@ jobs: platforms: ${{ parameters.platforms }} variables: # map dependencies variables to local variables - - name: librariesContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] - name: alwaysRunVar value: ${{ parameters.alwaysRun }} - - name: allWasmContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'] ] - name: shouldRunOnDefaultPipelines value: $[ or( diff --git a/eng/pipelines/common/templates/wasm-build-tests.yml b/eng/pipelines/common/templates/wasm-build-tests.yml index 07c253ed80bf1..274dd4e9f712f 100644 --- a/eng/pipelines/common/templates/wasm-build-tests.yml +++ b/eng/pipelines/common/templates/wasm-build-tests.yml @@ -20,10 +20,6 @@ jobs: shouldContinueOnError: ${{ parameters.shouldContinueOnError }} variables: # map dependencies variables to local variables - - name: wasmbuildtestsContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_wasmbuildtests.containsChange'] ] - - name: allWasmContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'] ] - name: alwaysRunVar value: ${{ parameters.alwaysRun }} - name: shouldRunOnDefaultPipelines diff --git a/eng/pipelines/common/templates/wasm-debugger-tests.yml b/eng/pipelines/common/templates/wasm-debugger-tests.yml index 8110158d4d7f8..94fd9e024e695 100644 --- a/eng/pipelines/common/templates/wasm-debugger-tests.yml +++ b/eng/pipelines/common/templates/wasm-debugger-tests.yml @@ -19,10 +19,6 @@ jobs: shouldContinueOnError: ${{ parameters.shouldContinueOnError }} variables: # map dependencies variables to local variables - - name: wasmdebuggertestsContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_wasmdebuggertests.containsChange'] ] - - name: allWasmContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'] ] - name: alwaysRunVar value: ${{ parameters.alwaysRun }} - name: shouldRunOnDefaultPipelines diff --git a/eng/pipelines/common/templates/wasm-runtime-tests.yml b/eng/pipelines/common/templates/wasm-runtime-tests.yml index e10ba56a47d39..c53869959ad7c 100644 --- a/eng/pipelines/common/templates/wasm-runtime-tests.yml +++ b/eng/pipelines/common/templates/wasm-runtime-tests.yml @@ -17,8 +17,6 @@ jobs: runtimeFlavor: mono platforms: ${{ parameters.platforms }} variables: - - name: allWasmContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'] ] - name: alwaysRunVar value: ${{ parameters.alwaysRun }} - name: timeoutPerTestInMinutes From faea7e38e308ef43b315a8d16ff561c0a57e60c5 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 30 Aug 2022 17:41:52 -0400 Subject: [PATCH 10/15] cleanup --- eng/pipelines/common/evaluate-default-paths.yml | 8 ++------ eng/pipelines/common/templates/wasm-runtime-tests.yml | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index a6d0a0cb78592..9a3f49d3c2f22 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -182,15 +182,11 @@ jobs: - src/mono/wasm/Wasm.Build.Tests/* - src/mono/wasm/debugger/* - # triggers most of the wasm jobs to run - subset: wasm include: - # other paths that should also trigger wasm jobs - - src/mono/*.proj - - src/mono/Directory.Build* - - src/mono/CMakeLists.txt - - src/mono/System.Private.CoreLib/* - ${{ parameters._const_paths._wasm_specific_only }} + # other paths that should also trigger wasm jobs + - src/mono/* # anything other than wasm-specific paths - subset: non_wasm diff --git a/eng/pipelines/common/templates/wasm-runtime-tests.yml b/eng/pipelines/common/templates/wasm-runtime-tests.yml index c53869959ad7c..8c091c165debf 100644 --- a/eng/pipelines/common/templates/wasm-runtime-tests.yml +++ b/eng/pipelines/common/templates/wasm-runtime-tests.yml @@ -26,10 +26,8 @@ jobs: - name: shouldRunOnDefaultPipelines value: $[ or( - eq(variables['alwaysRunVar'], true), eq(variables['wasmDarcDependenciesChanged'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true)) ] jobParameters: From f0284581031cce75af4cc3b75cf813883dff592d Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 30 Aug 2022 17:43:24 -0400 Subject: [PATCH 11/15] cleanup --- eng/pipelines/common/evaluate-default-paths.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 9a3f49d3c2f22..1d51eed954265 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -46,9 +46,6 @@ jobs: - eng/pipelines/libraries/* - eng/pipelines/common/evaluate-default-paths.yml - # JUST FOR TESTING THIS PR - - eng/pipelines/* - - subset: mono_excluding_wasm include: - src/libraries/System.Private.CoreLib/* @@ -74,8 +71,6 @@ jobs: - eng/pipelines/libraries/* - eng/pipelines/common/evaluate-default-paths.yml - # JUST FOR TESTING THIS PR - - eng/pipelines/* - subset: libraries exclude: - eng/Version.Details.xml @@ -94,8 +89,6 @@ jobs: - eng/pipelines/installer/* - eng/pipelines/common/evaluate-default-paths.yml - # JUST FOR TESTING THIS PR - - eng/pipelines/* - subset: runtimetests include: - src/tests/* @@ -119,8 +112,6 @@ jobs: - eng/pipelines/libraries/* - eng/pipelines/common/evaluate-default-paths.yml - # JUST FOR TESTING THIS PR - - eng/pipelines/* # We have limited Apple Silicon testing capacity # We want PR testing on a narrower set of changes # Specifically runtime directories which are higher risk of @@ -197,9 +188,6 @@ jobs: # trigger non-onlywasm jobs - eng/pipelines/common/evaluate-default-paths.yml - # JUST FOR TESTING THIS PR - - eng/pipelines/* - # anything other than mono, or wasm specific paths - subset: non_mono_and_wasm exclude: @@ -215,8 +203,5 @@ jobs: - src/tasks/WasmBuildTasks/* - src/tasks/WorkloadBuildTasks/* - # JUST FOR TESTING THIS PR - - eng/pipelines/* - - ${{ if ne(parameters.extraSubsets, '') }}: - ${{ parameters.extraSubsets }} From 20f634dc1be29b748b32ac00e6b8dc669e8dec5e Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 30 Aug 2022 22:02:15 -0400 Subject: [PATCH 12/15] fix typo --- eng/pipelines/runtime-linker-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml index 2f4dacb8ea714..bf72b50bfe18e 100644 --- a/eng/pipelines/runtime-linker-tests.yml +++ b/eng/pipelines/runtime-linker-tests.yml @@ -96,7 +96,7 @@ jobs: or( eq(variables['isRollingBuild'], true), 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_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_NET_ILLink_Tasks'], true)) extraStepsTemplate: /eng/pipelines/libraries/execute-trimming-tests-steps.yml extraStepsParameters: From 438769f8bdff726bce659841c8a830ffc259a029 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 31 Aug 2022 01:34:38 -0400 Subject: [PATCH 13/15] fix merge --- eng/pipelines/common/templates/wasm-build-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/common/templates/wasm-build-tests.yml b/eng/pipelines/common/templates/wasm-build-tests.yml index 274dd4e9f712f..8597a4e368628 100644 --- a/eng/pipelines/common/templates/wasm-build-tests.yml +++ b/eng/pipelines/common/templates/wasm-build-tests.yml @@ -26,7 +26,6 @@ jobs: value: $[ or( eq(variables['wasmDarcDependenciesChanged'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_wasmbuildtests.containsChange'], true)) ] jobParameters: From 5c3bb74f9d3ccb9a9a90413f4bc45bf0d6162ecd Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 31 Aug 2022 01:43:46 -0400 Subject: [PATCH 14/15] dummy --- eng/pipelines/common/templates/wasm-build-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/common/templates/wasm-build-tests.yml b/eng/pipelines/common/templates/wasm-build-tests.yml index 8597a4e368628..3ade2d7ce08db 100644 --- a/eng/pipelines/common/templates/wasm-build-tests.yml +++ b/eng/pipelines/common/templates/wasm-build-tests.yml @@ -51,3 +51,4 @@ jobs: extraHelixArguments: /p:BrowserHost=$(_hostedOs) scenarios: - buildwasmapps + From 7d235988b741ce82c4a02cb7ee8002b516a0fcae Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 31 Aug 2022 15:09:58 -0400 Subject: [PATCH 15/15] fix merge --- .../common/templates/wasm-library-tests.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/pipelines/common/templates/wasm-library-tests.yml b/eng/pipelines/common/templates/wasm-library-tests.yml index f87f66a27d303..782ee9c959063 100644 --- a/eng/pipelines/common/templates/wasm-library-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-tests.yml @@ -30,20 +30,20 @@ jobs: value: ${{ parameters.alwaysRun }} - name: shouldRunOnDefaultPipelines value: $[ - eq(variables['wasmDarcDependenciesChanged'], true), - and( - ne(variables['onlyWBTOrDbgTestHaveChanges'], true), - or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true)))) + or( + eq(variables['wasmDarcDependenciesChanged'], true), + and( + ne(variables['onlyWBTOrDbgTestHaveChanges'], true), + or( + 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.containsChange'], true)))) ] - name: onlyWBTOrDbgTestHaveChanges value: and( eq(dependencies.evaluate_paths.outputs.SetPathVars_wasm_wbt_or_dbg.containsChange, true), ne(dependencies.evaluate_paths.outputs.SetPathVars_any_other_than_wasm_wbt_dbg.containsChange, true)) - jobParameters: isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }} testGroup: innerloop