Skip to content

Commit d6fe08c

Browse files
lewinggrendello
authored andcommitted
Revert "[browser][MT] move wasm MT CI legs to extra-platforms (dotnet#112690)" (dotnet#112712)
This reverts commit 3c97a90.
1 parent 398968d commit d6fe08c

File tree

3 files changed

+27
-17
lines changed

3 files changed

+27
-17
lines changed

eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,6 @@ jobs:
7474
scenarios:
7575
- WasmTestOnChrome
7676

77-
# Library tests with full threading
78-
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
79-
parameters:
80-
platforms:
81-
- browser_wasm
82-
#- browser_wasm_win
83-
nameSuffix: _Threading
84-
extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
85-
extraHelixArguments: /p:WasmEnableThreads=true
86-
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
87-
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
88-
alwaysRun: ${{ parameters.isWasmOnlyBuild }}
89-
shouldRunSmokeOnly: onLibrariesAndIllinkChanges
90-
scenarios:
91-
- WasmTestOnChrome
92-
9377
# EAT Library tests - only run on linux
9478
- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
9579
parameters:
@@ -178,6 +162,7 @@ jobs:
178162
- browser_wasm_win
179163
nameSuffix: MultiThreaded
180164
extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
165+
condition: ne(variables['wasmMultiThreadedBuildOnlyNeededOnDefaultPipeline'], true)
181166
publishArtifactsForWorkload: true
182167
publishWBT: false
183168

eng/pipelines/runtime.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,20 @@ extends:
822822
scenarios:
823823
- WasmTestOnChrome
824824

825+
# Library tests with full threading
826+
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
827+
parameters:
828+
platforms:
829+
- browser_wasm
830+
#- browser_wasm_win
831+
nameSuffix: _Threading
832+
extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
833+
extraHelixArguments: /p:WasmEnableThreads=true
834+
alwaysRun: ${{ variables.isRollingBuild }}
835+
shouldRunSmokeOnly: onLibrariesAndIllinkChanges
836+
scenarios:
837+
- WasmTestOnChrome
838+
825839
# EAT Library tests - only run on linux
826840
- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
827841
parameters:
@@ -857,6 +871,17 @@ extends:
857871
publishArtifactsForWorkload: true
858872
publishWBT: true
859873

874+
- template: /eng/pipelines/common/templates/wasm-build-only.yml
875+
parameters:
876+
platforms:
877+
- browser_wasm
878+
- browser_wasm_win
879+
condition: or(eq(variables.isRollingBuild, true), eq(variables.wasmSingleThreadedBuildOnlyNeededOnDefaultPipeline, true))
880+
nameSuffix: MultiThreaded
881+
extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
882+
publishArtifactsForWorkload: true
883+
publishWBT: false
884+
860885
# Browser Wasm.Build.Tests
861886
- template: /eng/pipelines/common/templates/browser-wasm-build-tests.yml
862887
parameters:

src/mono/wasm/features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Some of these properties require a unique build of the runtime, which means that
2323

2424
### Multi-threading
2525

26-
Multi-threading experiment is enabled by `<WasmEnableThreads>true</WasmEnableThreads>`, and is currently disabled by default. It requires a unique build of the runtime.
26+
Multi-threading support is enabled by `<WasmEnableThreads>true</WasmEnableThreads>`, and is currently disabled by default. It requires a unique build of the runtime.
2727

2828
Your HTTPS server and/or proxy must be configured to send HTTP headers similar to `Cross-Origin-Embedder-Policy:require-corp` and `Cross-Origin-Opener-Policy:same-origin` in order to enable multi-threading support in end-user web browsers for security reasons.
2929

0 commit comments

Comments
 (0)