From a9f9bfd75b457d96b1eeb6825d633d222777ae52 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 8 Feb 2023 01:21:31 -0500 Subject: [PATCH 1/7] evaluate-default-paths.yml: Add paths for wasi .. and exclude wasm specific paths from coreclr. --- eng/pipelines/common/evaluate-default-paths.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index fd0697b027c5b2..5bb975858f36a4 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -7,9 +7,13 @@ parameters: _const_paths: _wasm_specific_only: [ eng/testing/ProvisioningVersions.props + eng/testing/Was*Runner* 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 +74,7 @@ jobs: - eng/pipelines/installer/* - eng/pipelines/mono/* - eng/pipelines/libraries/* + - ${{ parameters._const_paths._wasm_specific_only }} - ${{ parameters._const_paths._wasm_pipelines }} - ${{ parameters._const_paths._always_exclude }} From 5c3f1ccbebe7c1389b56671913cf45b77b2dbd60 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 8 Feb 2023 01:29:15 -0500 Subject: [PATCH 2/7] disable runtime-wasm-optional automatic trigger for PRs --- eng/pipelines/runtime-wasm-optional.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/eng/pipelines/runtime-wasm-optional.yml b/eng/pipelines/runtime-wasm-optional.yml index 86840d3e35db9c..a1392e62456171 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 From 7bd515781dda82f6cb9a4a113af46c3a05a584b2 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 8 Feb 2023 12:52:19 -0500 Subject: [PATCH 3/7] CI: skip debugger tests on runtime-wasm if they run on runtime pipeline .. too. --- eng/pipelines/common/templates/wasm-debugger-tests.yml | 7 ++++++- .../extra-platforms/runtime-extra-platforms-wasm.yml | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/wasm-debugger-tests.yml b/eng/pipelines/common/templates/wasm-debugger-tests.yml index 994b169df9a00c..877c41f993a2d5 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 + runOnlyOnWasmPipelines: false extraBuildArgs: '' nameSuffix: '' platforms: [] @@ -23,6 +24,8 @@ jobs: # map dependencies variables to local variables - name: alwaysRunVar value: ${{ parameters.alwaysRun }} + - name: runOnlyOnWasmPipelinesVar + value: ${{ parameters.runOnlyOnWasmPipelines }} - name: shouldRunOnDefaultPipelines value: $[ or( @@ -47,7 +50,9 @@ jobs: condition: >- or( eq(variables['alwaysRunVar'], true), - eq(variables['isDefaultPipeline'], variables['shouldRunOnDefaultPipelines'])) + and( + eq(variables['isDefaultPipeline'], variables['shouldRunOnDefaultPipelines']), + eq(variables['runOnlyOnWasmPipelinesVar']))) 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 d1b25fde405143..ca343a754343d8 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 }} + runOnlyOnWasmPipelines: true # Disable for now #- template: /eng/pipelines/coreclr/perf-wasm-jobs.yml From 1167328a23cc571b13c3ffcf4c60fcb2775d446c Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 8 Feb 2023 13:25:37 -0500 Subject: [PATCH 4/7] fix condition --- eng/pipelines/common/templates/wasm-debugger-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/wasm-debugger-tests.yml b/eng/pipelines/common/templates/wasm-debugger-tests.yml index 877c41f993a2d5..a58009b999dfe4 100644 --- a/eng/pipelines/common/templates/wasm-debugger-tests.yml +++ b/eng/pipelines/common/templates/wasm-debugger-tests.yml @@ -52,7 +52,7 @@ jobs: eq(variables['alwaysRunVar'], true), and( eq(variables['isDefaultPipeline'], variables['shouldRunOnDefaultPipelines']), - eq(variables['runOnlyOnWasmPipelinesVar']))) + ne(variables['runOnlyOnWasmPipelinesVar']), 'true')) extraStepsTemplate: /eng/pipelines/libraries/helix.yml extraStepsParameters: creator: dotnet-bot From 4d686f16f72f75266d272fc5da08df039c9d6dc4 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 8 Feb 2023 20:57:44 +0000 Subject: [PATCH 5/7] address review feedback from @kg --- eng/pipelines/common/evaluate-default-paths.yml | 2 +- eng/pipelines/common/templates/wasm-debugger-tests.yml | 4 ++-- .../extra-platforms/runtime-extra-platforms-wasm.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 5bb975858f36a4..89c07318c43a25 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -7,7 +7,7 @@ parameters: _const_paths: _wasm_specific_only: [ eng/testing/ProvisioningVersions.props - eng/testing/Was*Runner* + eng/testing/Was?Runner* eng/testing/scenarios/BuildWasmAppsJobsList.txt eng/testing/tests.browser.targets eng/testing/tests.was*.targets diff --git a/eng/pipelines/common/templates/wasm-debugger-tests.yml b/eng/pipelines/common/templates/wasm-debugger-tests.yml index a58009b999dfe4..68238cb6244251 100644 --- a/eng/pipelines/common/templates/wasm-debugger-tests.yml +++ b/eng/pipelines/common/templates/wasm-debugger-tests.yml @@ -4,7 +4,7 @@ parameters: isWasmOnlyBuild: false browser: 'chrome' shouldContinueOnError: false - runOnlyOnWasmPipelines: false + runOnlyOnWasmOnlyPipelines: false extraBuildArgs: '' nameSuffix: '' platforms: [] @@ -25,7 +25,7 @@ jobs: - name: alwaysRunVar value: ${{ parameters.alwaysRun }} - name: runOnlyOnWasmPipelinesVar - value: ${{ parameters.runOnlyOnWasmPipelines }} + value: ${{ parameters.runOnlyOnWasmOnlyPipelines }} - name: shouldRunOnDefaultPipelines value: $[ or( diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml index ca343a754343d8..de1be931bf4698 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml @@ -241,7 +241,7 @@ jobs: alwaysRun: ${{ parameters.isWasmOnlyBuild }} isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - runOnlyOnWasmPipelines: true + runOnlyOnWasmOnlyPipelines: true # Disable for now #- template: /eng/pipelines/coreclr/perf-wasm-jobs.yml From e3275cfd1b4940b0da77545993106910c89dc6dd Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 8 Feb 2023 21:07:44 +0000 Subject: [PATCH 6/7] 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 ']'.` --- eng/pipelines/common/evaluate-default-paths.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 89c07318c43a25..d77e8a9de715fb 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -7,7 +7,8 @@ parameters: _const_paths: _wasm_specific_only: [ eng/testing/ProvisioningVersions.props - eng/testing/Was?Runner* + eng/testing/WasmRunner* + eng/testing/WasiRunner* eng/testing/scenarios/BuildWasmAppsJobsList.txt eng/testing/tests.browser.targets eng/testing/tests.was*.targets From e787ad48c7f42ff3d29f20be917d023862b2e681 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 8 Feb 2023 16:48:42 -0500 Subject: [PATCH 7/7] fix syntax error in yml --- eng/pipelines/common/templates/wasm-debugger-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/wasm-debugger-tests.yml b/eng/pipelines/common/templates/wasm-debugger-tests.yml index 68238cb6244251..4d8ec6e67d4b73 100644 --- a/eng/pipelines/common/templates/wasm-debugger-tests.yml +++ b/eng/pipelines/common/templates/wasm-debugger-tests.yml @@ -52,7 +52,7 @@ jobs: eq(variables['alwaysRunVar'], true), and( eq(variables['isDefaultPipeline'], variables['shouldRunOnDefaultPipelines']), - ne(variables['runOnlyOnWasmPipelinesVar']), 'true')) + ne(variables['runOnlyOnWasmPipelinesVar'], 'true'))) extraStepsTemplate: /eng/pipelines/libraries/helix.yml extraStepsParameters: creator: dotnet-bot