diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2016-11-17 15:33:01 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2016-11-18 22:19:18 +0000 |
commit | 48507e9e3c803aaa356d71f257e9e4847e830270 (patch) | |
tree | 4ecdf5b20afddd8c45e46e21dce6b606dd53127b /coin/provisioning | |
parent | 1bf242603ceeee4a667da69a0f1bc41773cf3842 (diff) |
Provisioning should fail in case of conan errors
Change-Id: I54ee86f5cf0f39cd7bafe71682b93a2a3c8fce5c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning')
-rw-r--r-- | coin/provisioning/common/03-conan.ps1 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1 index 3c1dbbcf..56242d34 100644 --- a/coin/provisioning/common/03-conan.ps1 +++ b/coin/provisioning/common/03-conan.ps1 @@ -35,12 +35,19 @@ function Run-Conan-Install $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" $manifestsDir = "$($_.DirectoryName)\$($_.BaseName).manifests" New-Item $outpwd -Type directory -Force - Start-Process-Logged ` + + $process = Start-Process-Logged ` conan ` -WorkingDirectory $outpwd ` -ArgumentList "install -f $($_.FullName) --verify $($manifestsDir)", ` '-s', ('compiler="' + $Compiler + '"'), ` "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion) $($extraArgs)" ` - -NoNewWindow -Wait -Verbose + -NoNewWindow -Wait -Verbose ` + -PassThru # Return process object + + if ($process.ExitCode -ne 0) { + Write-Host "conan exited with code $($process.ExitCode)" + Exit(1) + } } } |