diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-11-16 21:13:42 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-11-19 16:30:20 +0000 |
| commit | 2b652e1ecb5f42389b766e4b522e59b9f39c5e79 (patch) | |
| tree | a1c1d534203ca4ca66c17484da14a5084c3a80c0 | |
| parent | 71910cefbcea79bbf78b436f1b14a003814e9600 (diff) | |
coin: Align PostgreSQL provisioning between macOS 11 and macOS 12
Change-Id: I48770c6c6a33375f621b228fc61b23a2c97f787c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 5733455993d45de495e618df7c8fad69d740120c)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -rwxr-xr-x | coin/provisioning/qtci-macos-12-x86_64/25-postgresql.sh | 56 |
1 files changed, 2 insertions, 54 deletions
diff --git a/coin/provisioning/qtci-macos-12-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-12-x86_64/25-postgresql.sh index 69cfa6aa..db1f5236 100755 --- a/coin/provisioning/qtci-macos-12-x86_64/25-postgresql.sh +++ b/coin/provisioning/qtci-macos-12-x86_64/25-postgresql.sh @@ -1,57 +1,5 @@ #!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2020 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script installs PostgreSQL - -# PostgreSQL is needed for Qt to be able to support PostgreSQL - 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" - -psqlVersion="9.6.0" - -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip" -AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/$psqlVersion/Postgres-$psqlVersion.zip" -SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5" -appPrefix="" - -InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" - -SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/9.6/bin" -echo "PostgreSQL = $psqlVersion" >> ~/versions.txt +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/postgresql.sh" |