Skip to content

Commit 38fd2cf

Browse files
authored
fix: keep winget output out of Inno path (#929)
1 parent 2c72025 commit 38fd2cf

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

scripts/build-inno-local.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ function Resolve-InnoCompiler {
6666

6767
if ($InstallInno) {
6868
Write-Step "Installing Inno Setup with winget"
69-
winget install --id JRSoftware.InnoSetup -e --accept-source-agreements --accept-package-agreements --disable-interactivity
70-
if ($LASTEXITCODE -ne 0) {
69+
winget install --id JRSoftware.InnoSetup -e --accept-source-agreements --accept-package-agreements --disable-interactivity 2>&1 | Out-Host
70+
$wingetExitCode = $LASTEXITCODE
71+
if ($wingetExitCode -ne 0) {
7172
throw "winget failed to install Inno Setup."
7273
}
7374
return Resolve-InnoCompiler

tests/OpenClaw.Tray.Tests/InstallerIssAssertionTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ public void LocalInstallerBuild_UsesOneIdentitySwitchAndValidatesPayloadMarker()
166166
Assert.Contains("$args += \"/DDevBuild=1\"", script);
167167
Assert.Contains("app-identity.txt", script);
168168
Assert.Contains("Payload identity", script);
169+
Assert.Contains("2>&1 | Out-Host", script);
170+
Assert.Contains("$wingetExitCode = $LASTEXITCODE", script);
169171
Assert.Contains("WritePublishedAppIdentityMarker", project);
170172
Assert.Contains("<AppIdentityMarker>dev</AppIdentityMarker>", project);
171173
Assert.Contains("<AppIdentityMarker>release</AppIdentityMarker>", project);

0 commit comments

Comments
 (0)