diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-09-17 21:04:03 +0300 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-09-18 05:57:54 +0000 |
| commit | 23d11128396da8362f27d703287600699b5a962c (patch) | |
| tree | c206028a3eafadd6b48c1bf4cfda730059275cbf | |
| parent | e1bfa77391fcf3d50f0d9f9375f5d123710395cf (diff) | |
Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows
Change-Id: I841783122edf82739826cc0a7672d8c809870e97
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | coin/provisioning/common/conan.ps1 | 4 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/conan.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/conan.ps1 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 117cdfc6..6d7cf07b 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -6,6 +6,8 @@ Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-w Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" & $installer /DIR=C:\Utils\Conan /VERYSILENT +[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") + function Run-Conan-Install { Param ( @@ -28,6 +30,4 @@ function Run-Conan-Install "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` -NoNewWindow -Wait } - - [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", $BuildinfoDir, "Machine") } diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 index a30be8d4..718d25de 100644 --- a/coin/provisioning/qtci-windows-10-x86/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -2,7 +2,7 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-X86 ` + -BuildinfoDir MSVC2015-x86 ` -Arch x86 ` -Compiler "Visual Studio" ` -CompilerVersion 14 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 index 759a251d..04887712 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 @@ -2,7 +2,7 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-X86_64 ` + -BuildinfoDir MSVC2015-x86_64 ` -Arch x86_64 ` -Compiler "Visual Studio" ` -CompilerVersion 14 |