diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2019-07-16 03:24:42 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-07-26 07:50:35 +0300 |
commit | cb8d38fd9cbfc3c83efffba3fc2587378e9f7476 (patch) | |
tree | 6a6fcd25c7ce14daca3dc16ea9354cdf6d7bcc8a /coin | |
parent | dd7a80d757eda6ae9213c40486e2ae2bea672135 (diff) |
Provisioning: don't re-run Conan 5 times if there is no error
Change-Id: Ia348ebbc4fc3a2503cc426c011e68b7a410c4a08
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin')
-rw-r--r-- | coin/provisioning/common/windows/03-conan.ps1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/windows/03-conan.ps1 b/coin/provisioning/common/windows/03-conan.ps1 index 74c21e20..0e9b9bc2 100644 --- a/coin/provisioning/common/windows/03-conan.ps1 +++ b/coin/provisioning/common/windows/03-conan.ps1 @@ -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) { |