Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[wasm] Do not run embuilder minimal build #83475

Merged
merged 13 commits into from
Mar 23, 2023
Merged

[wasm] Do not run embuilder minimal build #83475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0993d5e
[wasm] Do not run embuilder minimal build
radekdoulik Mar 15, 2023
866bfa8
Merge remote-tracking branch 'remotes/origin/main' into pr-wasm-do-no…
radekdoulik Mar 17, 2023
58b1958
Update emsdk deps
radekdoulik Mar 17, 2023
988ccd4
Do not set WasmCachePath for AOT tests
radekdoulik Mar 17, 2023
f4ec18f
Merge remote-tracking branch 'remotes/origin/main' into pr-wasm-do-no…
radekdoulik Mar 17, 2023
2ff14aa
Use staging images
radekdoulik Mar 19, 2023
52c82f0
Use specific images as staging are not ready
radekdoulik Mar 20, 2023
272bc2c
Revert "Do not set WasmCachePath for AOT tests"
radekdoulik Mar 21, 2023
b6ef622
Do not set WasmCachePath for AOT tests
radekdoulik Mar 17, 2023
ced9d59
Merge branch 'main' into pr-wasm-do-not-prime-cache
radekdoulik Mar 22, 2023
c838909
Use the stable images again
radekdoulik Mar 23, 2023
9b8d618
One more image to stable
radekdoulik Mar 23, 2023
37f37ee
Remove obsolete line
radekdoulik Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions eng/testing/tests.browser.targets
View file
Open in desktop
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
View file
Open in desktop
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