summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Tokarev <ktokarev@smartlabs.tv>2019-07-16 18:38:32 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2019-07-26 19:52:24 +0300
commit2666f3b21609e0e22ffd1bbeead3ff91b8b0ca93 (patch)
tree2e61841e49ca9910cee1de6099a650c99a16f4eb
parent535dbcfe962199fb39aa02cd0f7a62a1e82bd8ea (diff)
Provisioning: rename 03-conan.ps1 to conan.ps1 to follow naming convention
Change-Id: If24541709d4675498bc4af296e05ce3c62d5045a Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-rw-r--r--coin/provisioning/common/windows/conan.ps1 (renamed from coin/provisioning/common/windows/03-conan.ps1)0
-rw-r--r--coin/provisioning/qtci-windows-10-x86/03-conan.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/03-conan.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/03-conan.ps12
4 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/windows/03-conan.ps1 b/coin/provisioning/common/windows/conan.ps1
index 15a1aaca..15a1aaca 100644
--- a/coin/provisioning/common/windows/03-conan.ps1
+++ b/coin/provisioning/common/windows/conan.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1
index 75c6a232..d33ceea8 100644
--- a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\windows\03-conan.ps1"
+. "$PSScriptRoot\..\common\windows\conan.ps1"
Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" `
diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
index c2068666..40131a81 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\windows\03-conan.ps1"
+. "$PSScriptRoot\..\common\windows\conan.ps1"
Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" `
diff --git a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1
index 807e5480..4aa9658d 100644
--- a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\windows\03-conan.ps1"
+. "$PSScriptRoot\..\common\windows\conan.ps1"
Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" `