From 0d72cee1b7c05d4c0ec31c045d19456067687fe0 Mon Sep 17 00:00:00 2001
From: tpetry <github@tpetry.me>
Date: Thu, 28 Dec 2023 10:18:46 +0100
Subject: [PATCH] chore: add newest database versions to test matrix

---
 .github/workflows/tests-maria.yml |  2 +-
 .github/workflows/tests-mysql.yml |  8 +++++---
 .github/workflows/tests.yml       | 29 +++++++++++++++++++++++++++--
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests-maria.yml b/.github/workflows/tests-maria.yml
index d756adc..e742dd5 100644
--- a/.github/workflows/tests-maria.yml
+++ b/.github/workflows/tests-maria.yml
@@ -22,7 +22,7 @@ jobs:
     services:
       database:
         image: mariadb:${{ inputs.version }}
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+        options: --health-cmd="healthcheck.sh --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
         ports:
diff --git a/.github/workflows/tests-mysql.yml b/.github/workflows/tests-mysql.yml
index 731e4a6..f1fcd83 100644
--- a/.github/workflows/tests-mysql.yml
+++ b/.github/workflows/tests-mysql.yml
@@ -21,11 +21,12 @@ jobs:
 
     services:
       database:
-        image: mysql:${{ inputs.version }}
+        image: container-registry.oracle.com/mysql/community-server:${{ inputs.version }}
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
         env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_DATABASE: testing
+          MYSQL_USER: testing
+          MYSQL_PASSWORD: testing
         ports:
           - 3306:3306
 
@@ -58,4 +59,5 @@ jobs:
         env:
           DB_CONNECTION: mysql
           DB_DATABASE: testing
-          DB_USERNAME: root
+          DB_USERNAME: testing
+          DB_PASSWORD: testing
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7edbf96..be6c089 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -43,17 +43,37 @@ jobs:
     uses: ./.github/workflows/tests-maria.yml
     with:
       version: "10.10"
+  maria11_0:
+    name: MariaDB 11.0
+    uses: ./.github/workflows/tests-maria.yml
+    with:
+      version: "11.0"
+  maria11_1:
+    name: MariaDB 11.1
+    uses: ./.github/workflows/tests-maria.yml
+    with:
+      version: "11.1"
+  maria11_2:
+    name: MariaDB 11.2
+    uses: ./.github/workflows/tests-maria.yml
+    with:
+      version: "11.2"
 
   mysql5_7:
     name: MySQL 5.7
     uses: ./.github/workflows/tests-mysql.yml
     with:
-      version: 5.7
+      version: "5.7"
   mysql8_0:
     name: MySQL 8.0
     uses: ./.github/workflows/tests-mysql.yml
     with:
-      version: 8.0
+      version: "8.0"
+  mysql8_1:
+    name: MySQL 8.1
+    uses: ./.github/workflows/tests-mysql.yml
+    with:
+      version: "8.1"
 
   pgsql10:
     name: PostgreSQL 10
@@ -85,6 +105,11 @@ jobs:
     uses: ./.github/workflows/tests-pgsql.yml
     with:
       version: 15
+  pgsql16:
+    name: PostgreSQL 16
+    uses: ./.github/workflows/tests-pgsql.yml
+    with:
+      version: 16
 
   sqlite:
     name: SQLite