Skip to content

Clean build during daily build to ensure MSI package is generate correctly #6334

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
TravisEz13 merged 6 commits into from
Mar 8, 2018
Merged

Clean build during daily build to ensure MSI package is generate correctly #6334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c8c1a4
publish heat file if msi generation fails on appveyor
TravisEz13 Mar 7, 2018
cc8209d
clean build before packaging
TravisEz13 Mar 7, 2018
68eb7a8
update for new MSI artifact object type
TravisEz13 Mar 7, 2018
4dd4e72
[Package] update for new MSI artifact object type
TravisEz13 Mar 7, 2018
1b62b59
[package] make sure only to get the right objects
TravisEz13 Mar 8, 2018
eb22cfb
[package] make fix universal for artifact and MSI smoke test
TravisEz13 Mar 8, 2018
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
22 changes: 18 additions & 4 deletions tools/appveyor.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,12 +450,25 @@ function Invoke-AppveyorFinish
try {
$releaseTag = Get-ReleaseTag

# Build clean before backing to remove files from testing
Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $releaseTag -Clean

# Build packages
$packages = Start-PSPackage -Type msi,nupkg,zip -ReleaseTag $releaseTag -SkipReleaseChecks
$msiObject = $packages | Where-Object { $_ -is [pscustomobject] -and $_.msi }
$msi = $msiObject | Where-Object { $_.msi.EndsWith(".msi") } | Select-Object -ExpandProperty msi

$artifacts = New-Object System.Collections.ArrayList
foreach ($package in $packages) {
$null = $artifacts.Add($package)
if($package -is [string])
{
$null = $artifacts.Add($package)
}
elseif($package -is [pscustomobject] -and $package.msi)
{
$null = $artifacts.Add($package.msi)
$null = $artifacts.Add($package.wixpdb)
}
}

if ($env:APPVEYOR_REPO_TAG_NAME)
Expand All @@ -477,8 +490,8 @@ function Invoke-AppveyorFinish
}

# Smoke Test MSI installer
Write-Verbose "Smoke-Testing MSI installer" -Verbose
$msi = $artifacts | Where-Object { $_.EndsWith(".msi") }
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
if ($msiExecProcess.ExitCode -ne 0)
Expand All @@ -487,7 +500,8 @@ function Invoke-AppveyorFinish
$exitCode = $msiExecProcess.ExitCode
throw "MSI installer failed and returned error code $exitCode. MSI Log was uploaded as artifact."
}
Write-Verbose "MSI smoke test was successful" -Verbose

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
12 changes: 12 additions & 0 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2278,6 +2278,18 @@ function Test-FileWxs

if(!$passed)
{
if($env:appveyor)
{
try
{
Push-AppveyorArtifact $HeatFilesWxsPath
}
catch
{
#ignore any error pushing the artifact
}
}

throw "Current files to not match {$FilesWxsPath}"
}
}
Expand Down