From eb1682f3ed064ffa2ed3781aa250db86e82831aa Mon Sep 17 00:00:00 2001
From: Brady Miller <brady.g.miller@gmail.com>
Date: Sun, 17 Mar 2024 02:41:52 -0700
Subject: [PATCH] chore: ci add mariadb 11.3, change mysql 8.2 to mysql 8.3
 (#7273)

---
 .github/workflows/test.yml                    | 100 +++++++++++++++++-
 ci/apache_83_113/docker-compose.yml           |  22 ++++
 .../docker-compose.yml                        |   2 +-
 3 files changed, 120 insertions(+), 4 deletions(-)
 create mode 100644 ci/apache_83_113/docker-compose.yml
 rename ci/{apache_83_82 => apache_83_83}/docker-compose.yml (96%)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 881c809acc0..3806e6c6094 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -197,6 +197,100 @@ jobs:
           build_test_common
         if: ${{ success() || failure() }}
 
+
+  build_apache_83_113:
+    name: PHP 8.3 - Apache - MariaDB 11.3 (short term release)
+    runs-on: ubuntu-22.04
+    env:
+      DOCKER_DIR: apache_83_113
+      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:
+      - uses: actions/checkout@v3
+
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.3'
+
+      - name: Report PHP Version
+        run: php -v
+
+      - name: Install npm package
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
+      - name: Main build
+        run: |
+          source ci/ciLibrary.source
+          composer_github_auth
+          main_build
+
+      - name: CCDA build
+        run: |
+          source ci/ciLibrary.source
+          ccda_build
+
+      - name: Dockers environment start
+        run: |
+          source ci/ciLibrary.source
+          dockers_env_start
+          sleep 60
+
+      - name: Install and configure
+        run: |
+          source ci/ciLibrary.source
+          install_configure
+
+      - name: Unit testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_unit
+        if: ${{ success() || failure() }}
+
+      - name: E2e testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_e2e
+        if: ${{ success() || failure() }}
+
+      - name: Api testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_api
+        if: ${{ success() || failure() }}
+
+      - name: Fixtures testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_fixtures
+        if: ${{ success() || failure() }}
+
+      - name: Services testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_services
+        if: ${{ success() || failure() }}
+
+      - name: Validators testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_validators
+        if: ${{ success() || failure() }}
+
+      - name: Controllers testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_controllers
+        if: ${{ success() || failure() }}
+
+      - name: Common testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_common
+        if: ${{ success() || failure() }}
+
   build_apache_83_112:
     name: PHP 8.3 - Apache - MariaDB 11.2 (short term release)
     runs-on: ubuntu-22.04
@@ -848,11 +942,11 @@ jobs:
           build_test_common
         if: ${{ success() || failure() }}
 
-  build_apache_83_82:
-    name: PHP 8.3 - Apache - MySQL 8.2 (short term release)
+  build_apache_83_83:
+    name: PHP 8.3 - Apache - MySQL 8.3 (short term release)
     runs-on: ubuntu-22.04
     env:
-      DOCKER_DIR: apache_83_82
+      DOCKER_DIR: apache_83_83
       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_113/docker-compose.yml b/ci/apache_83_113/docker-compose.yml
new file mode 100644
index 00000000000..7cfd2ed34c5
--- /dev/null
+++ b/ci/apache_83_113/docker-compose.yml
@@ -0,0 +1,22 @@
+# docker-compose.yml for travis ci testing
+version: '3.1'
+services:
+  mysql:
+    restart: always
+    image: mariadb:11.3
+    command: ['mariadbd','--character-set-server=utf8mb4']
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+  openemr:
+    restart: always
+    image: openemr/openemr:flex-3.19
+    ports:
+    - 80:80
+    - 443:443
+    volumes:
+    - ../../:/var/www/localhost/htdocs/openemr
+    environment:
+      FORCE_NO_BUILD_MODE: "yes"
+      EMPTY: "yes"
+    depends_on:
+    - mysql
diff --git a/ci/apache_83_82/docker-compose.yml b/ci/apache_83_83/docker-compose.yml
similarity index 96%
rename from ci/apache_83_82/docker-compose.yml
rename to ci/apache_83_83/docker-compose.yml
index 1b66dcb9675..91e20a8c64f 100644
--- a/ci/apache_83_82/docker-compose.yml
+++ b/ci/apache_83_83/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.1'
 services:
   mysql:
     restart: always
-    image: mysql:8.2
+    image: mysql:8.3
     command: ['mysqld','--character-set-server=utf8mb4','--default-authentication-plugin=mysql_native_password']
     environment:
       MYSQL_ROOT_PASSWORD: root