From 0c6dc883e522cf1e7789fcbc9550a9d08a05e6de Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Fri, 19 Mar 2021 12:47:25 +0200 Subject: [PATCH] Provision conan on ubuntu 18 and macos 11 Change-Id: Ie11e8bb2b39acd3ab6229cb211c37500cbb7ed77 Reviewed-by: Heikki Halmet (cherry picked from commit f83567b7f5d0bea595e7fbe7ecfb3ac44327d10c) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-Ubuntu-18.04-x86_64/30-install-conan.sh | 6 ++++++ .../provisioning/qtci-macos-11.0-x86_64/30-install-conan.sh | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-install-conan.sh create mode 100755 coin/provisioning/qtci-macos-11.0-x86_64/30-install-conan.sh 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"