Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 12 deletions tools/appveyor.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,6 @@ function Get-ReleaseTag
# Implements AppVeyor 'on_finish' step
function Invoke-AppveyorFinish
{
$exitCode = 0
try {
$releaseTag = Get-ReleaseTag

Expand Down Expand Up @@ -488,7 +487,7 @@ function Invoke-AppveyorFinish
}

# Smoke Test MSI installer
log "Smoke-Testing MSI installer"
Write-Log "Smoke-Testing MSI installer"
$msi = $artifacts | Where-Object { $_.EndsWith(".msi")}
$msiLog = Join-Path (Get-Location) 'msilog.txt'
$msiExecProcess = Start-Process msiexec.exe -Wait -ArgumentList "/I $msi /quiet /l*vx $msiLog" -NoNewWindow -PassThru
Expand All @@ -498,7 +497,7 @@ function Invoke-AppveyorFinish
$exitCode = $msiExecProcess.ExitCode
throw "MSI installer failed and returned error code $exitCode. MSI Log was uploaded as artifact."
}
log "MSI smoke test was successful"
Write-Log "MSI smoke test was successful"

# only publish assembly nuget packages if it is a daily build and tests passed
if((Test-DailyBuild) -and $env:TestPassed -eq 'True')
Expand Down Expand Up @@ -552,14 +551,6 @@ function Invoke-AppveyorFinish
}
catch {
Write-Host -Foreground Red $_
}
finally {
# A throw statement would not make the build fail. This function is AppVeyor specific
# and is the only command executed in 'on_finish' phase, so it's safe that we request
# the current runspace to exit with the specified exit code. If the exit code is non-zero,
# AppVeyor will fail the build.
# See this link for details:
# https://help.appveyor.com/discussions/problems/4498-powershell-exception-in-test_script-does-not-fail-build
$host.SetShouldExit($exitCode)
throw $_
}
}
2 changes: 1 addition & 1 deletion tools/packaging/packaging.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -2286,7 +2286,7 @@ function Test-FileWxs
}
catch
{
#ignore any error pushing the artifact
Write-Warning -Message "Pushing MSI File fragment failed."
}
}

Expand Down