aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToni Saario <toni.saario@qt.io>2021-12-22 15:04:30 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-01-07 16:34:51 +0000
commitfd0e5d85b025fac8d7fd4df2bc80e2a8be573db9 (patch)
tree26c405907d005748e3036fecfa51692207760e77
parent18a3cb62e8fe37d71901b362024640141ad17208 (diff)
Provision conan on arm macOS
Change-Id: Ibf074c39b7bf3ac0f0f16a5a65d11022f9ec7e04 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> (cherry picked from commit 81dcae4f9370495c648c55669c7d439edd150239) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rwxr-xr-xcoin/provisioning/qtci-macos-11.0-arm/30-install-conan.sh6
-rwxr-xr-xcoin/provisioning/qtci-macos-12.0-arm/30-install-conan.sh6
2 files changed, 12 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-macos-11.0-arm/30-install-conan.sh b/coin/provisioning/qtci-macos-11.0-arm/30-install-conan.sh
new file mode 100755
index 00000000..ec54fa54
--- /dev/null
+++ b/coin/provisioning/qtci-macos-11.0-arm/30-install-conan.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/install-conan.sh"
diff --git a/coin/provisioning/qtci-macos-12.0-arm/30-install-conan.sh b/coin/provisioning/qtci-macos-12.0-arm/30-install-conan.sh
new file mode 100755
index 00000000..ec54fa54
--- /dev/null
+++ b/coin/provisioning/qtci-macos-12.0-arm/30-install-conan.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/install-conan.sh"