From 765e3dbb2d3aa2b114d8c07e44ae2ca926df16b4 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 8 Feb 2023 20:20:08 -0500 Subject: [PATCH] evaluate-default-paths.yml: Add paths for wasi (#81817) * evaluate-default-paths.yml: Add paths for wasi .. and exclude wasm specific paths from coreclr. * disable runtime-wasm-optional automatic trigger for PRs * CI: skip debugger tests on runtime-wasm if they run on runtime pipeline .. too. * fix condition * address review feedback from @kg * Fix yml issue Using `Was?Runner*` failed to validate on azdo with: `/eng/pipelines/common/evaluate-default-paths.yml (Line: 10, Col: 24): While parsing a flow sequence, did not find expected ',' or ']'.` * fix syntax error in yml --- eng/pipelines/common/evaluate-default-paths.yml | 8 +++++++- eng/pipelines/common/templates/wasm-debugger-tests.yml | 7 ++++++- eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml | 1 + eng/pipelines/runtime-wasm-optional.yml | 5 +---- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index fd0697b..d77e8a9 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -7,9 +7,14 @@ parameters: _const_paths: _wasm_specific_only: [ eng/testing/ProvisioningVersions.props + eng/testing/WasmRunner* + eng/testing/WasiRunner* eng/testing/scenarios/BuildWasmAppsJobsList.txt - eng/testing/tests.wasm.targets + eng/testing/tests.browser.targets + eng/testing/tests.was*.targets + eng/testing/was*provisioning.targets src/libraries/sendtohelix-wasm.targets + src/libraries/sendtohelix-wasi.targets src/mono/mono/**/*wasm* src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/* src/mono/nuget/Microsoft.NET.Runtime.wasm.Sample.Mono/* @@ -70,6 +75,7 @@ jobs: - eng/pipelines/installer/* - eng/pipelines/mono/* - eng/pipelines/libraries/* + - ${{ parameters._const_paths._wasm_specific_only }} - ${{ parameters._const_paths._wasm_pipelines }} - ${{ parameters._const_paths._always_exclude }} diff --git a/eng/pipelines/common/templates/wasm-debugger-tests.yml b/eng/pipelines/common/templates/wasm-debugger-tests.yml index 994b169..4d8ec6e 100644 --- a/eng/pipelines/common/templates/wasm-debugger-tests.yml +++ b/eng/pipelines/common/templates/wasm-debugger-tests.yml @@ -4,6 +4,7 @@ parameters: isWasmOnlyBuild: false browser: 'chrome' shouldContinueOnError: false + runOnlyOnWasmOnlyPipelines: false extraBuildArgs: '' nameSuffix: '' platforms: [] @@ -23,6 +24,8 @@ jobs: # map dependencies variables to local variables - name: alwaysRunVar value: ${{ parameters.alwaysRun }} + - name: runOnlyOnWasmPipelinesVar + value: ${{ parameters.runOnlyOnWasmOnlyPipelines }} - name: shouldRunOnDefaultPipelines value: $[ or( @@ -47,7 +50,9 @@ jobs: condition: >- or( eq(variables['alwaysRunVar'], true), - eq(variables['isDefaultPipeline'], variables['shouldRunOnDefaultPipelines'])) + and( + eq(variables['isDefaultPipeline'], variables['shouldRunOnDefaultPipelines']), + ne(variables['runOnlyOnWasmPipelinesVar'], 'true'))) extraStepsTemplate: /eng/pipelines/libraries/helix.yml extraStepsParameters: creator: dotnet-bot diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml index d1b25fd..de1be93 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml @@ -241,6 +241,7 @@ jobs: alwaysRun: ${{ parameters.isWasmOnlyBuild }} isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} + runOnlyOnWasmOnlyPipelines: true # Disable for now #- template: /eng/pipelines/coreclr/perf-wasm-jobs.yml diff --git a/eng/pipelines/runtime-wasm-optional.yml b/eng/pipelines/runtime-wasm-optional.yml index 86840d3..a1392e6 100644 --- a/eng/pipelines/runtime-wasm-optional.yml +++ b/eng/pipelines/runtime-wasm-optional.yml @@ -1,8 +1,5 @@ -# This is a wrapper yml for `extra-platforms/runtime-extra-platforms-wasm.yml`, which -# has all the wasm jobs. This file is essentially so we can have point -# the pipeline in azdo UI to this, and thus avoid any scheduled triggers - trigger: none +pr: none variables: - template: /eng/pipelines/common/variables.yml -- 2.7.4