diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-04 22:21:23 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-04 22:21:23 +0100 |
commit | ad3c5195259321ab8420df0dee1a9b14cfc4811b (patch) | |
tree | f6dd1fc9f3b0578a261294f43fe7ed477c9108cc /coin/provisioning/common/03-conan.ps1 | |
parent | 111799abf170d4a65358aa84d1f1d9a92bee6350 (diff) | |
parent | 8de4f42cb62b083cee959ae196eec6c593b3f8ea (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I415772838a8434d00ad4ccebc8b1c4180e85880b
Diffstat (limited to 'coin/provisioning/common/03-conan.ps1')
-rw-r--r-- | coin/provisioning/common/03-conan.ps1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1 index 04be729d..6a4b4ebb 100644 --- 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.16.0 +& "$scriptsPath\pip.exe" install --upgrade conan==0.20.2 [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") |