From b0b372c271cc5faf6b44d03ac2f86cb6529a6082 Mon Sep 17 00:00:00 2001
From: Brady Miller <brady.g.miller@gmail.com>
Date: Wed, 27 Dec 2023 03:14:32 -0800
Subject: [PATCH] chore: updated mariadb testing versions for ci (#7124)

---
 .github/workflows/test.yml                    | 25 +++++++++----------
 .../docker-compose.yml                        |  4 +--
 2 files changed, 14 insertions(+), 15 deletions(-)
 rename ci/{apache_83_1010 => apache_83_112}/docker-compose.yml (83%)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d5f9fefe340..881c809acc0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -197,12 +197,11 @@ jobs:
           build_test_common
         if: ${{ success() || failure() }}
 
-
-  build_apache_83_111:
-    name: PHP 8.3 - Apache - MariaDB 11.1 (short term release)
+  build_apache_83_112:
+    name: PHP 8.3 - Apache - MariaDB 11.2 (short term release)
     runs-on: ubuntu-22.04
     env:
-      DOCKER_DIR: apache_83_111
+      DOCKER_DIR: apache_83_112
       OPENEMR_DIR: /var/www/localhost/htdocs/openemr
       CHROMIUM_INSTALL: "apk update; apk add --no-cache chromium chromium-chromedriver; export PANTHER_CHROME_DRIVER_BINARY=/usr/lib/chromium/chromedriver"
     steps:
@@ -291,11 +290,11 @@ jobs:
           build_test_common
         if: ${{ success() || failure() }}
 
-  build_apache_83_110:
-    name: PHP 8.3 - Apache - MariaDB 11.0 (short term release)
+  build_apache_83_111:
+    name: PHP 8.3 - Apache - MariaDB 11.1 (short term release)
     runs-on: ubuntu-22.04
     env:
-      DOCKER_DIR: apache_83_110
+      DOCKER_DIR: apache_83_111
       OPENEMR_DIR: /var/www/localhost/htdocs/openemr
       CHROMIUM_INSTALL: "apk update; apk add --no-cache chromium chromium-chromedriver; export PANTHER_CHROME_DRIVER_BINARY=/usr/lib/chromium/chromedriver"
     steps:
@@ -384,11 +383,11 @@ jobs:
           build_test_common
         if: ${{ success() || failure() }}
 
-  build_apache_83_1011:
-    name: PHP 8.3 - Apache - MariaDB 10.11
+  build_apache_83_110:
+    name: PHP 8.3 - Apache - MariaDB 11.0 (short term release)
     runs-on: ubuntu-22.04
     env:
-      DOCKER_DIR: apache_83_1011
+      DOCKER_DIR: apache_83_110
       OPENEMR_DIR: /var/www/localhost/htdocs/openemr
       CHROMIUM_INSTALL: "apk update; apk add --no-cache chromium chromium-chromedriver; export PANTHER_CHROME_DRIVER_BINARY=/usr/lib/chromium/chromedriver"
     steps:
@@ -477,11 +476,11 @@ jobs:
           build_test_common
         if: ${{ success() || failure() }}
 
-  build_apache_83_1010:
-    name: PHP 8.3 - Apache - MariaDB 10.10 (short term release)
+  build_apache_83_1011:
+    name: PHP 8.3 - Apache - MariaDB 10.11
     runs-on: ubuntu-22.04
     env:
-      DOCKER_DIR: apache_83_1010
+      DOCKER_DIR: apache_83_1011
       OPENEMR_DIR: /var/www/localhost/htdocs/openemr
       CHROMIUM_INSTALL: "apk update; apk add --no-cache chromium chromium-chromedriver; export PANTHER_CHROME_DRIVER_BINARY=/usr/lib/chromium/chromedriver"
     steps:
diff --git a/ci/apache_83_1010/docker-compose.yml b/ci/apache_83_112/docker-compose.yml
similarity index 83%
rename from ci/apache_83_1010/docker-compose.yml
rename to ci/apache_83_112/docker-compose.yml
index dc58b17312a..f625b952c96 100644
--- a/ci/apache_83_1010/docker-compose.yml
+++ b/ci/apache_83_112/docker-compose.yml
@@ -3,8 +3,8 @@ version: '3.1'
 services:
   mysql:
     restart: always
-    image: mariadb:10.10
-    command: ['mysqld','--character-set-server=utf8mb4']
+    image: mariadb:11.2
+    command: ['mariadbd','--character-set-server=utf8mb4']
     environment:
       MYSQL_ROOT_PASSWORD: root
   openemr: