Skip to content

[wasm] windows: Fail the build if provisioning fails #59560

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

Merged
marek-safar merged 4 commits into from
Sep 27, 2021
Merged

[wasm] windows: Fail the build if provisioning fails #59560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
968b775
[wasm] windows: Fail the build if provisioning fails
radical Sep 24, 2021
01bc170
Address review feedback
radical Sep 24, 2021
2a75e87
[wasm] Windows: install certificates for python using `certifi`
radical Sep 24, 2021
eadfacd
Add back the cert update code
radical Sep 24, 2021
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
15 changes: 9 additions & 6 deletions eng/pipelines/mono/update-machine-certs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
# This seems to update the machine cert store so that python can download the files as required by emscripten's install
# Based on info at https://pypi.org/project/certifi/
pip install certifi

$WebsiteURL="storage.googleapis.com"
Try {
$Conn = New-Object System.Net.Sockets.TcpClient($WebsiteURL,443)
$Conn = New-Object System.Net.Sockets.TcpClient($WebsiteURL,443)

Try {
$Stream = New-Object System.Net.Security.SslStream($Conn.GetStream())
$Stream.AuthenticateAsClient($WebsiteURL)
$Stream.AuthenticateAsClient($WebsiteURL)

$Cert = $Stream.Get_RemoteCertificate()

$ValidTo = [datetime]::Parse($Cert.GetExpirationDatestring())

Write-Host "`nConnection Successfull" -ForegroundColor DarkGreen
Write-Host "Website: $WebsiteURL"
}
Expand Down
9 changes: 7 additions & 2 deletions src/mono/mono.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,18 +136,23 @@

<PropertyGroup>
<EmsdkExt Condition="'$(OS)' != 'Windows_NT'">.sh</EmsdkExt>
<EmsdkExt Condition="'$(OS)' == 'Windows_NT'">.bat</EmsdkExt>
<EmsdkExt Condition="'$(OS)' == 'Windows_NT'">.ps1</EmsdkExt>
<EMSDK_PATH>$(ProvisionEmscriptenDir)</EMSDK_PATH>
<WasmLocalPath>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'wasm'))</WasmLocalPath>
<EmsdkLocalPath>emsdk</EmsdkLocalPath>
<EmscriptenVersion>%(_VersionLines.Identity)</EmscriptenVersion>

<InstallCmd>./emsdk$(EmsdkExt) install $(EmscriptenVersion)</InstallCmd>
<ActivateCmd>./emsdk$(EmsdkExt) activate $(EmscriptenVersion)</ActivateCmd>
<InstallCmd Condition="'$(OS)' == 'Windows_NT'">powershell -NonInteractive -command &quot;&amp; $(InstallCmd); Exit $LastExitCode &quot;</InstallCmd>
<ActivateCmd Condition="'$(OS)' == 'Windows_NT'">powershell -NonInteractive -command &quot;&amp; $(ActivateCmd); Exit $LastExitCode &quot;</ActivateCmd>
</PropertyGroup>

<RemoveDir Directories="$(EMSDK_PATH)" />
<Exec Command="git clone https://github.com/emscripten-core/emsdk.git emsdk"
WorkingDirectory="$(WasmLocalPath)"
IgnoreStandardErrorWarningFormat="true" />
<Exec Command="git checkout $(EmscriptenVersion) &amp;&amp; emsdk$(EmsdkExt) install $(EmscriptenVersion) &amp;&amp; emsdk$(EmsdkExt) activate $(EmscriptenVersion)"
<Exec Command="git checkout $(EmscriptenVersion) &amp;&amp; $(InstallCmd) &amp;&amp; $(ActivateCmd)"
WorkingDirectory="$(EMSDK_PATH)"
IgnoreStandardErrorWarningFormat="true" />
</Target>
Expand Down