Skip to content

Commit

Permalink
[wasm] Do not run embuilder minimal build (#83475)
Browse files Browse the repository at this point in the history
* [wasm] Do not run embuilder minimal build

* Update emsdk deps

* Do not set WasmCachePath for AOT tests

* Use staging images

* Use specific images as staging are not ready

* Revert "Do not set WasmCachePath for AOT tests"

This reverts commit 988ccd4.

* Do not set WasmCachePath for AOT tests

* Use the stable images again

The changes should be already in

* One more image to stable

* Remove obsolete line
  • Loading branch information
radekdoulik authored Mar 23, 2023
1 parent 316d286 commit 96e0331
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
2 changes: 0 additions & 2 deletions eng/testing/tests.browser.targets
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@
<_AOTBuildCommand Condition="'$(BrowserHost)' != 'windows'">_buildAOTFunc publish/ProxyProjectForAOTOnHelix.proj $XHARNESS_OUT/AOTBuild.binlog</_AOTBuildCommand>
<_AOTBuildCommand Condition="'$(BrowserHost)' == 'windows'">dotnet msbuild publish/ProxyProjectForAOTOnHelix.proj /bl:%XHARNESS_OUT%/AOTBuild.binlog</_AOTBuildCommand>

<_AOTBuildCommand Condition="'$(BrowserHost)' == 'windows'">$(_AOTBuildCommand) &quot;/p:WasmCachePath=%USERPROFILE%\.emscripten-cache&quot;</_AOTBuildCommand>

<!-- running aot-helix tests locally, so we can test with the same project file as CI -->
<_AOTBuildCommand Condition="'$(ContinuousIntegrationBuild)' != 'true'">$(_AOTBuildCommand) /p:RuntimeSrcDir=$(RepoRoot) /p:RuntimeConfig=$(Configuration)</_AOTBuildCommand>

Expand Down
10 changes: 0 additions & 10 deletions src/mono/wasm/build/WasmApp.Native.targets
Original file line number Diff line number Diff line change
Expand Up @@ -308,25 +308,15 @@
<Target Name="_WasmSelectRuntimeComponentsForLinking" Condition="'$(WasmNativeWorkload)' == 'true'" DependsOnTargets="_MonoSelectRuntimeComponents" />

<Target Name="_WasmCompileNativeFiles" DependsOnTargets="_CheckEmccIsExpectedVersion">
<PropertyGroup>
<_EmBuilder Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">embuilder.bat</_EmBuilder>
<_EmBuilder Condition="!$([MSBuild]::IsOSPlatform('WINDOWS'))">embuilder.py</_EmBuilder>
</PropertyGroup>

<ItemGroup>
<_EmccCFlags Include="$(EmccExtraCFlags)" />
</ItemGroup>

<WriteLinesToFile Lines="@(_EmccCFlags)" File="$(_EmccCompileRsp)" Overwrite="true" WriteOnlyWhenDifferent="true" />
<ItemGroup>
<FileWrites Include="$(_EmccCompileRsp)" />
<_EmscriptenEnvVarsForBuildMinimal Include="@(EmscriptenEnvVars)" />
<_EmscriptenEnvVarsForBuildMinimal Include="FROZEN_CACHE=" />
</ItemGroup>

<!-- warm up the cache -->
<Exec Command="$(_EmBuilder) build MINIMAL" EnvironmentVariables="@(_EmscriptenEnvVarsForBuildMinimal)" StandardOutputImportance="Low" StandardErrorImportance="Low" />

<Message Text="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..." Importance="High" />
<ItemGroup>
<_WasmSourceFileToCompile Remove="@(_WasmSourceFileToCompile)" />
Expand Down

0 comments on commit 96e0331

Please sign in to comment.