diff options
| author | Toni Saario <toni.saario@qt.io> | 2021-03-19 12:47:15 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-12 07:21:53 +0000 |
| commit | d1601aa0f94de81fe6b1651a2a3f5ce0a52a1ed3 (patch) | |
| tree | 4f241dea4d256be3618c24286f2a6368748066e9 | |
| parent | 88b3474bcfe60be5c18cdabdc6839ca6f519561a (diff) | |
Add conan to path
Change-Id: I90e028409f606a703fd9b567a221f3f946f11d61
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 32579bc3c429931d257265e69d828f85a55f599b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
8 files changed, 15 insertions, 6 deletions
diff --git a/coin/provisioning/common/unix/install-conan.sh b/coin/provisioning/common/unix/install-conan.sh index 4d3a6da0..6827f6fe 100755 --- a/coin/provisioning/common/unix/install-conan.sh +++ b/coin/provisioning/common/unix/install-conan.sh @@ -6,7 +6,15 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # This script will install Conan # Note! Python3 is required for Conan installation +os="$1" + # Install Conan to Python user install directory (typically ~./local/) pip3 install conan --user SetEnvVar "CONAN_REVISIONS_ENABLED" "1" + +if [ "$os" == "linux" ]; then + SetEnvVar "PATH" "/home/qt/.local/bin:\$PATH" +elif [ "$os" == "macos" ]; then + SetEnvVar "PATH" "/Users/qt/Library/Python/3.7/bin:\$PATH" +fi diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index 33c32740..d880c794 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -44,6 +44,7 @@ Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintra Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos" Set-EnvironmentVariable "CONAN_REVISIONS_ENABLED" "1" +Add-Path $scriptsPath function Run-Conan-Install { diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-conan.sh index ec54fa54..b8820053 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-conan.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-conan.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install-conan.sh" +"$BASEDIR/../common/unix/install-conan.sh" "linux" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/30-install-conan.sh index ec54fa54..b8820053 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/30-install-conan.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/30-install-conan.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install-conan.sh" +"$BASEDIR/../common/unix/install-conan.sh" "linux" diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install-conan.sh index ec54fa54..b8820053 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install-conan.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install-conan.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install-conan.sh" +"$BASEDIR/../common/unix/install-conan.sh" "linux" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/30-install-conan.sh index ec54fa54..b8820053 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/30-install-conan.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/30-install-conan.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install-conan.sh" +"$BASEDIR/../common/unix/install-conan.sh" "linux" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-install-conan.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-install-conan.sh index ec54fa54..f1d084fd 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/30-install-conan.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-install-conan.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install-conan.sh" +"$BASEDIR/../common/unix/install-conan.sh" "macos" diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/30-install-conan.sh b/coin/provisioning/qtci-macos-10.15-x86_64/30-install-conan.sh index ec54fa54..f1d084fd 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/30-install-conan.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/30-install-conan.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install-conan.sh" +"$BASEDIR/../common/unix/install-conan.sh" "macos" |