lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-13 15:56:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: don't re-run Conan 5 times if there is no error

Browse Source 
Change-Id: Ia348ebbc4fc3a2503cc426c011e68b7a410c4a08
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Konstantin Tokarev
2019-07-16 03:24:42 +03:00
parent dd7a80d757
commit cb8d38fd9c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/windows/03-conan.ps1
View File

@@ -42,7 +42,7 @@ function Run-Conan-Install
Push-Location $outpwd
Run-Executable "$scriptsPath\conan.exe" "install -f $conanfile --no-imports --verify $manifestsDir", `
'-s', ('compiler="' + $Compiler + '"'), `
"-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" `
"-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs"
break;
} catch {
if ($i -eq 5) {