diff options
| author | Toni Saario <toni.saario@qt.io> | 2021-03-19 12:47:25 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-12 07:21:35 +0000 |
| commit | 0c6dc883e522cf1e7789fcbc9550a9d08a05e6de (patch) | |
| tree | bcc27f25fdd41979b6633fec08bcd738dff82e85 /coin | |
| parent | f5c5309067d5f7a35f3725dde6ef121ee8cc5e49 (diff) | |
Provision conan on ubuntu 18 and macos 11
Change-Id: Ie11e8bb2b39acd3ab6229cb211c37500cbb7ed77
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit f83567b7f5d0bea595e7fbe7ecfb3ac44327d10c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin')
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-install-conan.sh | 6 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-macos-11.0-x86_64/30-install-conan.sh | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-install-conan.sh new file mode 100755 index 00000000..b8820053 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-install-conan.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install-conan.sh" "linux" diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/30-install-conan.sh b/coin/provisioning/qtci-macos-11.0-x86_64/30-install-conan.sh new file mode 100755 index 00000000..f1d084fd --- /dev/null +++ b/coin/provisioning/qtci-macos-11.0-x86_64/30-install-conan.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install-conan.sh" "macos" |