From f32e6543bed286cc798812c95ae757a27656c6a2 Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Thu, 4 May 2023 22:34:19 -0400 Subject: [PATCH] ci: Install PostgreSQL 12 on focal. The previous commit removed support for PostgreSQL 11, and PostgreSQL 10 support was removed in 11a86ec32832. --- tools/ci/production-install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/ci/production-install b/tools/ci/production-install index b76bbcf8dc..34d76c5fe3 100755 --- a/tools/ci/production-install +++ b/tools/ci/production-install @@ -61,9 +61,9 @@ os_info="$( read -r os_version_id } <<<"$os_info" -# Pin to PostgreSQL 10 on Ubuntu 20.04, so we can test upgrading it +# Pin PostgreSQL on Ubuntu 20.04, so we can test upgrading it if [ "$os_id $os_version_id" = 'ubuntu 20.04' ]; then - export POSTGRESQL_VERSION=10 + export POSTGRESQL_VERSION=12 fi # Install @@ -76,8 +76,8 @@ else fi if [ "$os_id $os_version_id" = 'ubuntu 20.04' ]; then - if [ "$(crudini --get /etc/zulip/zulip.conf postgresql version)" != "10" ]; then - echo "Installer did not install the PostgreSQL 10 that we asked for!" + if [ "$(crudini --get /etc/zulip/zulip.conf postgresql version)" != "12" ]; then + echo "Installer did not install the PostgreSQL 12 that we asked for!" exit 1 fi fi