From ef16167da4ec2f62de65d67f37126ad90195d793 Mon Sep 17 00:00:00 2001
From: Sean Quah <seanq@matrix.org>
Date: Tue, 8 Nov 2022 15:23:43 +0000
Subject: [PATCH 1/2] Test against PostgreSQL 15 in CI

Resolves #14170.

Signed-off-by: Sean Quah <seanq@matrix.org>
---
 .ci/scripts/calculate_jobs.py | 2 +-
 .github/workflows/tests.yml   | 2 +-
 changelog.d/14394.misc        | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/14394.misc

diff --git a/.ci/scripts/calculate_jobs.py b/.ci/scripts/calculate_jobs.py
index c53d4d5ff128..3bca75c2a6cd 100755
--- a/.ci/scripts/calculate_jobs.py
+++ b/.ci/scripts/calculate_jobs.py
@@ -64,7 +64,7 @@ def set_output(key: str, value: str):
         {
             "python-version": "3.11",
             "database": "postgres",
-            "postgres-version": "14",
+            "postgres-version": "15",
             "extras": "all",
         }
     )
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fea33abd12b4..739bf066ad83 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -412,7 +412,7 @@ jobs:
             postgres-version: "10"
 
           - python-version: "3.11"
-            postgres-version: "14"
+            postgres-version: "15"
 
     services:
       postgres:
diff --git a/changelog.d/14394.misc b/changelog.d/14394.misc
new file mode 100644
index 000000000000..8b816eb0a3c0
--- /dev/null
+++ b/changelog.d/14394.misc
@@ -0,0 +1 @@
+Test against PostgreSQL 15 in CI.

From 33d0d14b3c3537cee784c597e0090e703e038339 Mon Sep 17 00:00:00 2001
From: Sean Quah <seanq@matrix.org>
Date: Tue, 8 Nov 2022 16:21:21 +0000
Subject: [PATCH 2/2] fixup: use PostgreSQL apt repository

---
 .github/workflows/tests.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 739bf066ad83..810d0500b8f4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -430,6 +430,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+      - name: Add PostgreSQL apt repository
+        # We need a version of pg_dump that can handle the version of
+        # PostgreSQL being tested against. The Ubuntu package repository lags
+        # behind new releases, so we have to use the PostreSQL apt repository.
+        # Steps taken from https://www.postgresql.org/download/linux/ubuntu/
+        run: |
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+          wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+          sudo apt-get update
       - run: sudo apt-get -qq install xmlsec1 postgresql-client
       - uses: matrix-org/setup-python-poetry@v1
         with: