diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2020-02-21 11:12:51 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2020-03-07 11:42:48 +0200 |
| commit | 11c702414ffa4d037924a186849581779fff2bbf (patch) | |
| tree | ad0f3e8caefd7407bd8f9a0eec02e383e20dd902 /coin/provisioning/common/windows/conan.ps1 | |
| parent | e4d68cf15e763eaef9e01342d45431ef609b7540 (diff) | |
Provisioning: update Conan and Conan packages to latest versions
Task-number: QTQAINFRA-3556
Change-Id: If9c600a6bb3aae893924f9372c8b248d3e58f887
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit b73e61a458b6cce4cbb5546a912b9def52779d51)
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'coin/provisioning/common/windows/conan.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/conan.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index d77d28e2..c5984e26 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -36,8 +36,8 @@ $scriptsPath = "C:\Python36\Scripts" -Run-Executable "$scriptsPath\pip3.exe" "install --upgrade conan==1.17.0" -Write-Output "Conan = 1.17.0" >> ~\versions.txt +Run-Executable "$scriptsPath\pip3.exe" "install -r $PSScriptRoot\conan_requirements.txt" +Write-Output "Conan = 1.22.2" >> ~\versions.txt # Use Qt Project repository by default Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force" |