diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-11-16 16:32:17 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2016-11-16 21:25:32 +0000 |
| commit | f8e075a67932714c35764b098045c276c26c0c2e (patch) | |
| tree | 7ba2408a8afcfc409ba8e064f663851ebe279a45 /coin/provisioning/qtci-windows-10-x86 | |
| parent | f910b2bbf964571014ac4ce193eb8c995c48614d (diff) | |
Install conan from pip instead of exe
This allows us to get it working on 32-bit Windows.
Also renamed conan.ps1 and python.ps1 to get proper provisioning order.
Change-Id: I2f21db7dd0edbacb4e44024d1c70b315fba55801
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/conan.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/python.ps1 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 index d5f5f9e2..4ba6c70c 100644 --- a/coin/provisioning/qtci-windows-10-x86/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\conan.ps1" +. "$PSScriptRoot\..\common\03-conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` diff --git a/coin/provisioning/qtci-windows-10-x86/python.ps1 b/coin/provisioning/qtci-windows-10-x86/python.ps1 index 5f8aa2f8..0e401c02 100644 --- a/coin/provisioning/qtci-windows-10-x86/python.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" +. "$PSScriptRoot\..\common\02-python.ps1" |