coin: Add PostgreSQL 14 to macOS 11 images

Needed for universal build of the psql plugin.

Task-number: QTBUG-93204
Change-Id: I2c2d4d0f5f019a0eb4069d7642a901db4cc69473
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 881738a01d79a06b83a88950eb3d73672b5698e3)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

2 files changed, 75 insertions, 54 deletions

diff --git a/coin/provisioning/common/macos/postgresql.sh b/coin/provisioning/common/macos/postgresql.sh
new file mode 100755
index 00000000..144e160b
--- /dev/null
+++ b/coin/provisioning/common/macos/postgresql.sh
@@ -0,0 +1,73 @@
+#!/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/unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+# shellcheck source=../common/unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+
+psqlAppVersion="2.5"
+psqlVersion="14"
+
+packageName="Postgres-$psqlAppVersion-$psqlVersion.dmg"
+
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/$packageName"
+AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/v$psqlAppVersion/$packageName"
+SHA1="04cb6939704c5ede5646c1da8a686da3ded98a26"
+appPrefix=""
+
+DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp/$packageName"
+
+mountpoint="/tmp/pg-mount"
+mkdir -p "$mountpoint"
+
+echo "Mounting $packageName in $mountpoint"
+hdiutil attach -nobrowse -mountpoint "$mountpoint" "/tmp/$packageName"
+
+rm -Rf /Applications/Postgres.app
+cp -Rf "$mountpoint/Postgres.app" /Applications
+
+umount "$mountpoint"
+echo "Removing $packageName"
+rm "/tmp/$packageName"
+
+SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/$psqlVersion/bin"
+echo "PostgreSQL = $psqlVersion ($psqlAppVersion)" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-11.0-x86_64/25-postgresql.sh
index 69cfa6aa..db1f5236 100755
--- a/coin/provisioning/qtci-macos-11.0-x86_64/25-postgresql.sh
+++ b/coin/provisioning/qtci-macos-11.0-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"