Provisioning: install x86 conan packages on MSVC2015-x86_64 Win 10 host

Also upgrade to Conan 0.24.0. Task-number: QTBUG-61829 Change-Id: Ia01609e5f2d8121eb216b03bc8e95bca7225042e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
MicheleValfre · Jul 9, 2017 · 6837a84 · 6837a84
1 parent a96119c
commit 6837a84
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1
@@ -2,7 +2,7 @@
 
 $scriptsPath = "C:\Python27\Scripts"
 
-& "$scriptsPath\pip.exe" install --upgrade conan==0.20.2
+& "$scriptsPath\pip.exe" install --upgrade conan==0.24.0
 
 [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")
 

diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
@@ -7,3 +7,11 @@ Run-Conan-Install `
     -Compiler "Visual Studio" `
     -CompilerVersion 14 `
     -CompilerRuntime MD
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir MSVC2015-x86 `
+    -Arch x86 `
+    -Compiler "Visual Studio" `
+    -CompilerVersion 14 `
+    -CompilerRuntime MD