diff options
| author | Toni Saario <toni.saario@qt.io> | 2021-03-02 17:06:17 +0200 |
|---|---|---|
| committer | Toni Saario <toni.saario@qt.io> | 2021-04-12 06:49:23 +0000 |
| commit | 3802e21afe8667ede561c88b5e1393a1550825de (patch) | |
| tree | 15da9c34c042ed3321b7fd099dea3f14d78e957e /coin | |
| parent | 7381cbeca87a9f6ede7dd7feee8d9560c31ce3d9 (diff) | |
Enable conan revisions mode
Pick-to: 6.1
Change-Id: I0fb9d6943cf0e6e54f631314a67348f703c31e41
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin')
| -rwxr-xr-x | coin/provisioning/common/unix/install-conan.sh | 4 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/conan.ps1 | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/coin/provisioning/common/unix/install-conan.sh b/coin/provisioning/common/unix/install-conan.sh index 617c730c..4d3a6da0 100755 --- a/coin/provisioning/common/unix/install-conan.sh +++ b/coin/provisioning/common/unix/install-conan.sh @@ -1,8 +1,12 @@ #!/usr/bin/env bash +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + # This script will install Conan # Note! Python3 is required for Conan installation # Install Conan to Python user install directory (typically ~./local/) pip3 install conan --user +SetEnvVar "CONAN_REVISIONS_ENABLED" "1" diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index 8b22ab1d..33c32740 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -43,6 +43,7 @@ Write-Output "Conan = 1.29.0" >> ~\versions.txt Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force" Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos" +Set-EnvironmentVariable "CONAN_REVISIONS_ENABLED" "1" function Run-Conan-Install { |