From 909eb1e37214fe0d5f0efb54bb37700cf10c7013 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Wed, 7 Apr 2021 18:44:14 -0700 Subject: upgrade gitlab CI, docs, and various scripts from postgresql 11 to 13 Expecting few if any compatibility issues with this transition. Actually upgrading the production databases will be some work, but will hopefully yield disk savings from changes in the B-Tree index on-disk format. --- .gitlab-ci.yml | 2 +- rust/INSTALL.md | 2 +- rust/migrations/2019-01-01-000000_init/up.sql | 1 + rust/tests/pg_tmp.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f71e2d77..9746b8ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ unified_test: DATABASE_URL: "postgres://fatcat_user:fatcat_pw@postgres/fatcat_test" TEST_DATABASE_URL: "postgres://fatcat_user:fatcat_pw@postgres/fatcat_test" services: - - "postgres:11" + - "postgres:13" before_script: - export PATH="$PATH:$CARGO_HOME/bin" - apt update -qy diff --git a/rust/INSTALL.md b/rust/INSTALL.md index 462072dc..3f8b6b84 100644 --- a/rust/INSTALL.md +++ b/rust/INSTALL.md @@ -7,7 +7,7 @@ directions are likely to end up out-of-date. To install manually, on a bare server, as root: adduser fatcat - apt install postgresql-11 postgresql-contrib postgresql-client-11 \ + apt install postgresql-13 postgresql-contrib postgresql-client-13 \ nginx build-essential git pkg-config libssl-dev libpq-dev \ htop screen mkdir -p /srv/fatcat diff --git a/rust/migrations/2019-01-01-000000_init/up.sql b/rust/migrations/2019-01-01-000000_init/up.sql index 5211b29a..519e5961 100644 --- a/rust/migrations/2019-01-01-000000_init/up.sql +++ b/rust/migrations/2019-01-01-000000_init/up.sql @@ -1,5 +1,6 @@ -- written for Postgres 9.6 with OSSP extension for UUIDs -- ... but actually runs on Postgres 11 in qa/production/tests +-- ... and now Postgres 13 -- Previously VARCHAR and fixed-size CHAR was used in this schema for specific -- columns (especially fixed-size external identifiers, and hashes). This was diff --git a/rust/tests/pg_tmp.sh b/rust/tests/pg_tmp.sh index 2036a76c..ae6860ef 100755 --- a/rust/tests/pg_tmp.sh +++ b/rust/tests/pg_tmp.sh @@ -41,7 +41,7 @@ done # bnewbold: hack this in to "make it work" on debian/ubuntu # bnewbold: also note, pg_virtualenv could also work, but is ubuntu/debian specific -export PATH="$PATH:/usr/lib/postgresql/9.6/bin:/usr/lib/postgresql/11/bin" +export PATH="$PATH:/usr/lib/postgresql/9.6/bin:/usr/lib/postgresql/11/bin:/usr/lib/postgresql/13/bin" initdb -V > /dev/null || exit 1 PGVER=$(psql -V | awk '{print $NF}') -- cgit v1.2.3