diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2019-12-12 16:15:53 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-12-13 14:58:08 +0100 |
commit | 68c8693e5b451106478c0bc54aa5125f6cc2b02d (patch) | |
tree | 490d1358ec74478e4f951056f8a67f88aaf3f8fe /coin/provisioning/qtci-macos-10.13-x86_64 | |
parent | 2d6f569ee9d66ff49ab803ad9c48a954e637e1da (diff) | |
parent | 3aef26846488f98110cb322ac6e9dda43649e993 (diff) |
Merge remote-tracking branch 'origin/wip/cmake' into dev
This merges merely the provisioning changes needed to perform cmake
builds in the CI. The platform configuration changes will be applied
incremental as we merge support in the individual modules.
Conflicts:
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Added ninja to
coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
just to force re-provisioning.
Removed module_config.yaml because that breaks license check in
qmake builds.
Change-Id: Ic074c0c881404f4361e61f66130c0cb07f5e8b84
Diffstat (limited to 'coin/provisioning/qtci-macos-10.13-x86_64')
-rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh (renamed from coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh | 5 |
4 files changed, 15 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh index 4f4d405e..4f4d405e 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh new file mode 100755 index 00000000..0faec4b4 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install freetype diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh new file mode 100755 index 00000000..c9d3e309 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install ninja diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh new file mode 100755 index 00000000..f8af516b --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install pcre2 |