diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-01 11:25:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-01 11:37:07 +0200 |
| commit | 29befcc995ebb3572ebe082c28e0e01f47b2baa2 (patch) | |
| tree | a9b9bfe69aaa9278e548c34c027b997632768ea7 /coin/provisioning/qtci-macos-10.13-x86_64 | |
| parent | b90dc27784a9d78284518e12b80a0054ef560760 (diff) | |
| parent | cfef857815392831dc15075c98c53041689a01a4 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
Change-Id: I48b1e814dd6328dfb2827d0898a277b81ec25e55
Diffstat (limited to 'coin/provisioning/qtci-macos-10.13-x86_64')
3 files changed, 7 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh new file mode 100755 index 00000000..08669e52 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh index 15511332..1138ad3f 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh @@ -3,5 +3,5 @@ set -ex -brew update + brew install p7zip |