summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-10-03 18:34:14 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2016-10-05 21:25:28 +0000
commit433f6dddb56d757827643bd1fa7b101a7e179f16 (patch)
treedd3a280c69ee13e6477dfbd787455ef1bc496f77
parente5627e6de35402ec227c95d5beef3fa04234d0dd (diff)
Execute Conan installer synchronously
PowerShell runs .exe's asynchronously by default, unlike all other commands. This behavior creates race condition when conanfile processing starts before conan installation is completed. Addition of "| Out-Null" to installer invocation makes it synchronous. Task-number: QTQAINFRA-998 Change-Id: Ic423514f15886e6ad9eb5c9422dd5382a3362380 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--coin/provisioning/common/conan.ps12
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1
index 6d7cf07b..a4c7ebe4 100644
--- a/coin/provisioning/common/conan.ps1
+++ b/coin/provisioning/common/conan.ps1
@@ -4,7 +4,7 @@ $installer = "c:\users\qt\downloads\conan-win_0_12_0.exe"
Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-win_0_12_0.exe http://ci-files01-hki.ci.local/input/conan/conan-win_0_12_0.exe $installer
Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51"
-& $installer /DIR=C:\Utils\Conan /VERYSILENT
+& $installer /DIR=C:\Utils\Conan /VERYSILENT | Out-Null
[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")