diff options
| -rw-r--r-- | coin/provisioning/common/02-python.ps1 (renamed from coin/provisioning/common/python.ps1) | 0 | ||||
| -rw-r--r-- | coin/provisioning/common/03-conan.ps1 (renamed from coin/provisioning/common/conan.ps1) | 8 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/conan.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/python.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/conan.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/python.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/conan.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/python.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-8-x86/python.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-8-x86_64/python.ps1 | 2 |
10 files changed, 10 insertions, 14 deletions
diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/02-python.ps1 index 39d8146d..39d8146d 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/02-python.ps1 diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/03-conan.ps1 index 086af1ec..3c1dbbcf 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/03-conan.ps1 @@ -1,10 +1,6 @@ . "$PSScriptRoot\helpers.ps1" -$installer = "c:\users\qt\downloads\conan-win_0_15_0.exe" - -Download https://github.com/conan-io/conan/releases/download/0.15.0/conan-win_0_15_0.exe http://ci-files01-hki.ci.local/input/windows/conan/conan-win_0_15_0.exe $installer -Verify-Checksum $installer "AE8DB31B34A9B88EA227F0FE283FC0F003D2BFDD" -& $installer /DIR=C:\Utils\Conan /VERYSILENT | Out-Null +& pip install --upgrade conan==0.15.0 [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") @@ -40,7 +36,7 @@ function Run-Conan-Install $manifestsDir = "$($_.DirectoryName)\$($_.BaseName).manifests" New-Item $outpwd -Type directory -Force Start-Process-Logged ` - "C:\Utils\Conan\conan\conan.exe" ` + conan ` -WorkingDirectory $outpwd ` -ArgumentList "install -f $($_.FullName) --verify $($manifestsDir)", ` '-s', ('compiler="' + $Compiler + '"'), ` 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" diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 index 9cf4fbf1..78de7043 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/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_64/python.ps1 b/coin/provisioning/qtci-windows-10-x86_64/python.ps1 index 5f8aa2f8..0e401c02 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/python.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" +. "$PSScriptRoot\..\common\02-python.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/conan.ps1 b/coin/provisioning/qtci-windows-7-x86/conan.ps1 index 7421b2da..163739fa 100644 --- a/coin/provisioning/qtci-windows-7-x86/conan.ps1 +++ b/coin/provisioning/qtci-windows-7-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-7-x86/python.ps1 b/coin/provisioning/qtci-windows-7-x86/python.ps1 index 5f8aa2f8..0e401c02 100644 --- a/coin/provisioning/qtci-windows-7-x86/python.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" +. "$PSScriptRoot\..\common\02-python.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/python.ps1 b/coin/provisioning/qtci-windows-8-x86/python.ps1 index 5f8aa2f8..0e401c02 100644 --- a/coin/provisioning/qtci-windows-8-x86/python.ps1 +++ b/coin/provisioning/qtci-windows-8-x86/python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" +. "$PSScriptRoot\..\common\02-python.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/python.ps1 b/coin/provisioning/qtci-windows-8-x86_64/python.ps1 index 5f8aa2f8..0e401c02 100644 --- a/coin/provisioning/qtci-windows-8-x86_64/python.ps1 +++ b/coin/provisioning/qtci-windows-8-x86_64/python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" +. "$PSScriptRoot\..\common\02-python.ps1" |