test latest 2 LTS MariaDB versions (only), added MariaDB 11.4

nextras · Nov 16, 2024 · 2d04b01 · 2d04b01
1 parent 8c2bcb9
commit 2d04b01
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -74,8 +74,9 @@ jobs:
         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"
-      mariadb105:
-        image: mariadb:10.5
+      # Latest 2 MariaDD LTS versions tested (https://endoflife.date/mariadb)
+      mariadb1011:
+        image: mariadb:10.11
         env:
           MYSQL_DATABASE: nextras_dbal_test
           MYSQL_ROOT_PASSWORD: root
@@ -87,6 +88,19 @@ jobs:
           --health-start-period 10s
           --health-timeout 5s
           --health-retries 10
+      mariadb114:
+        image: mariadb:11.4
+        env:
+          MYSQL_DATABASE: nextras_dbal_test
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3309:3306
+        options: >-
+          --health-cmd "healthcheck.sh --su-mysql --connect --innodb_initialized"
+          --health-interval 10s
+          --health-start-period 10s
+          --health-timeout 5s
+          --health-retries 10
       postgres13:
         image: postgres:13
         env:
@@ -135,6 +149,9 @@ jobs:
       - name: Create MS SQL Database
         run: docker exec -i mssql /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'CREATE DATABASE nextras_dbal_test'
 
+      - name: Set up Timezones in MariaDB
+        run: docker exec $(docker ps -q --filter "ancestor=mariadb:11.4") bash -c "mariadb-tzinfo-to-sql /usr/share/zoneinfo | mariadb -u root -proot mysql"
+
       - name: Setup PHP cache environment
         id: php-extensions-cache
         uses: shivammathur/cache-extensions@v1

diff --git a/tests/databases.github.ini b/tests/databases.github.ini
@@ -30,22 +30,38 @@ username = root
 password = root
 port = 3307
 
-[mysql mariadb105]
+[mysql mariadb1011]
 driver = mysqli
 host = "127.0.0.1"
 database = nextras_dbal_test
 username = root
 password = root
 port = 3308
 
-[mysql mariadb105pdo]
+[mysql mariadb1011pdo]
 driver = pdo_mysql
 host = "127.0.0.1"
 database = nextras_dbal_test
 username = root
 password = root
 port = 3308
 
+[mysql mariadb114]
+driver = mysqli
+host = "127.0.0.1"
+database = nextras_dbal_test
+username = root
+password = root
+port = 3309
+
+[mysql mariadb114pdo]
+driver = pdo_mysql
+host = "127.0.0.1"
+database = nextras_dbal_test
+username = root
+password = root
+port = 3309
+
 [pgsql 13]
 driver = pgsql
 host = "127.0.0.1"