From 8c2bcb97b08e77a4120a9b382c970ecb8036b43e Mon Sep 17 00:00:00 2001
From: Jan Skrasek <hrach.cz@gmail.com>
Date: Sat, 16 Nov 2024 19:50:37 +0100
Subject: [PATCH] test LTS MySQL versions (only), added MySQL 8.4

---
 .github/workflows/build.yml | 19 ++++++-------------
 tests/databases.github.ini  |  8 ++++----
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aab4c05..8037e65 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,21 +63,14 @@ jobs:
     runs-on: ubuntu-latest
 
     services:
-      mysql57:
-        image: mysql:5.7
-        env:
-          MYSQL_DATABASE: nextras_dbal_test
-          MYSQL_ROOT_PASSWORD: root
-        ports:
-          - 3306:3306
-        options: >-
-          --health-cmd "mysqladmin ping -ppass"
-          --health-interval 10s
-          --health-start-period 10s
-          --health-timeout 5s
-          --health-retries 10
+      # MySQL LTS versions tested (https://endoflife.date/mysql)
       mysql80:
         image: mysql:8.0
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping -ppass" --health-interval=10s --health-timeout=5s --health-retries=5 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=nextras_dbal_test --entrypoint sh mysql:8 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
+      mysql84:
+        image: mysql:8.4
         ports:
           - 3307:3306
         options: --health-cmd="mysqladmin ping -ppass" --health-interval=10s --health-timeout=5s --health-retries=5 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=nextras_dbal_test --entrypoint sh mysql:8 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
diff --git a/tests/databases.github.ini b/tests/databases.github.ini
index f2fc630..4c395ac 100644
--- a/tests/databases.github.ini
+++ b/tests/databases.github.ini
@@ -1,4 +1,4 @@
-[mysql 5.7]
+[mysql 8.0]
 driver = mysqli
 host = "127.0.0.1"
 database = nextras_dbal_test
@@ -6,7 +6,7 @@ username = root
 password = root
 port = 3306
 
-[mysql 5.7pdo]
+[mysql 8.0pdo]
 driver = pdo_mysql
 host = "127.0.0.1"
 database = nextras_dbal_test
@@ -14,7 +14,7 @@ username = root
 password = root
 port = 3306
 
-[mysql 8.0]
+[mysql 8.4]
 driver = mysqli
 host = "127.0.0.1"
 database = nextras_dbal_test
@@ -22,7 +22,7 @@ username = root
 password = root
 port = 3307
 
-[mysql 8.0pdo]
+[mysql 8.4pdo]
 driver = pdo_mysql
 host = "127.0.0.1"
 database = nextras_dbal_test