From 2c0df1b9d4d7abe1bb68ddfb62a43a46084a44a3 Mon Sep 17 00:00:00 2001
From: Jan Pieter Waagmeester <jieter@waarneming.nl>
Date: Wed, 26 Jun 2024 12:36:49 +0200
Subject: [PATCH] Use postgres 14 for django master

---
 .github/workflows/ci.yml | 42 +++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eb08c3a..a12949f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-python@v5.1.0
+        with:
+          python-version: "3.11"
       - uses: actions/checkout@v4
       - run: python -m pip install --upgrade black
       - run: black --check .
@@ -13,6 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-python@v5.1.0
+        with:
+          python-version: "3.11"
       - uses: actions/checkout@v4
       - run: python -m pip install flake8
       - run: flake8
@@ -21,6 +25,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-python@v5.1.0
+        with:
+          python-version: "3.11"
       - uses: actions/checkout@v4
       - run: python -m pip install psycopg isort==5.13.2
       - run: isort --diff --check .
@@ -35,37 +41,51 @@ jobs:
 
   tests:
     runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:13.13
-        env:
-          POSTGRES_USER: modeltrans
-          POSTGRES_PASSWORD: modeltrans
-          POSTGRES_DB: modeltrans
-        ports:
-          - 5432:5432
 
     strategy:
       matrix:
         python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
-        django-version: [4.2, 5.0, master]
+        django-version: [4.2, 5.0, 5.1a1, master]
+        postgres-version: ["postgres:13.13", "postgres:14"]
         exclude:
             # Django 4.2
             - python-version: 3.12
               django-version: 4.2
+            - django-version: 4.2
+              postgres-version: postgres:13.13
 
             # Django 5.0
             - python-version: 3.8
               django-version: 5.0
             - python-version: 3.9
               django-version: 5.0
+            - django-version: 5.0
+              postgres-version: postgres:13.13
+
+            # Django 5.1a1
+            - python-version: 3.8
+              django-version: 5.1a1
+            - python-version: 3.9
+              django-version: 5.1a1
+            - django-version: 5.1
+              postgres-version: postgres:13.13
 
             # master
             - python-version: 3.8
               django-version: master
             - python-version: 3.9
               django-version: master
-
+            - django-version: master
+              postgres-version: postgres:13.13
+    services:
+      postgres:
+        image: ${{ matrix.postgres-version }}
+        env:
+          POSTGRES_USER: modeltrans
+          POSTGRES_PASSWORD: modeltrans
+          POSTGRES_DB: modeltrans
+        ports:
+          - 5432:5432
     steps:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5.1.0