mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-24 16:05:36 +08:00
Provisioning should fail in case of conan errors
Change-Id: I54ee86f5cf0f39cd7bafe71682b93a2a3c8fce5c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user