diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 14:10:00 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 14:10:44 +0100 |
| commit | 250e07e99accec41c37a0be5311c404dc22a0eac (patch) | |
| tree | 78a4602c69a55129ab7feb1d4137f05d075dbe27 /coin/provisioning/qtci-osx-10.11-x86_64 | |
| parent | 18b5dbf7df629e3b92152d53d8db8dd8e7d8ba7f (diff) | |
| parent | a434f14bd93f387f5f981fcd7d27ce95384d1ce6 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I4eadb7ffafdf5cbc821d1f0a96734b0f83243464
Diffstat (limited to 'coin/provisioning/qtci-osx-10.11-x86_64')
4 files changed, 18 insertions, 4 deletions
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh index b68d62f8..610f7a8e 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh @@ -1,6 +1,10 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash set -ex +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + # Enables the usage of temporary keychains for SSL autotests -echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc +SetEnvVar "QT_SSL_USE_TEMPORARY_KEYCHAIN" "1" + diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh index 89534baf..1908c79b 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh @@ -41,6 +41,8 @@ set -ex # shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz" AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" @@ -52,6 +54,7 @@ sudo mkdir -p "/opt" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir" -echo "export MYSQLBINPATH=/opt/mysql57/bin" >> ~/.bashrc +SetEnvVar "MYSQLBINPATH" "/opt/mysql57/bin" + echo "MySQL = 5.7.15" >> ~/versions.txt diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh index 8d88630b..7fedb4a2 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh @@ -41,6 +41,8 @@ set -ex # shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip" AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip" @@ -49,6 +51,7 @@ appPrefix="" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" -echo "export POSTGRESQLBINPATH=/Applications/Postgres.app/Contents/Versions/9.6/bin" >> ~/.bashrc +SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/9.6/bin" + echo "PostgreSQL = 9.6.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/90-squish.sh b/coin/provisioning/qtci-osx-10.11-x86_64/90-squish.sh new file mode 100755 index 00000000..27ff15c3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +$BASEDIR/../common/unix/squishInstall.sh + |