From 706fb4cd463f640e2d365a7b88578d4a7d4e3f71 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Fri, 19 Dec 2025 14:55:27 +0100
Subject: [PATCH] CI: Another try with inline mysql start

---
 .github/actions/setup-database/action.yml     | 27 +++----------------
 .../workflows/github_action_test_suite.yml    |  3 +++
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/.github/actions/setup-database/action.yml b/.github/actions/setup-database/action.yml
index ab1e10c05a..ee06374282 100644
--- a/.github/actions/setup-database/action.yml
+++ b/.github/actions/setup-database/action.yml
@@ -43,31 +43,12 @@ runs:
         echo "MySQL is ready"
       shell: bash
 
-    - name: Set up MySQL Configuration and Privileges
+    - name: Set up MySQL Privileges
       if: ${{ inputs.database == 'mysql' }}
       run: |
-        # Create MySQL config file inside the container and restart MySQL to apply settings
-        # This ensures settings are applied at server startup, similar to command-line arguments
-        CONTAINER_ID=$(docker ps --filter "ancestor=mysql:8.0" --format "{{.ID}}" | head -1)
-        if [ -n "$CONTAINER_ID" ]; then
-          # Create config file in container
-          docker exec $CONTAINER_ID sh -c 'printf "[mysqld]\ncharacter-set-server=utf8mb4\ncollation-server=utf8mb4_unicode_ci\ninnodb-default-row-format=DYNAMIC\n" > /etc/mysql/conf.d/custom.cnf'
-          # Restart MySQL to apply config (graceful shutdown and start)
-          docker exec $CONTAINER_ID sh -c 'mysqladmin -u root -proot_password shutdown' || true
-          sleep 2
-          docker start $CONTAINER_ID
-          # Wait for MySQL to be ready again
-          until mysqladmin ping -h 127.0.0.1 -u root -proot_password --silent; do
-            sleep 1
-            echo -n .
-          done
-        fi
-        # Also set global variables as a fallback (though config file should handle this)
-        mysql -u root -proot_password -h 127.0.0.1 mysql <<EOF
-        SET GLOBAL character_set_server = 'utf8mb4';
-        SET GLOBAL collation_server = 'utf8mb4_unicode_ci';
-        SET GLOBAL innodb_default_row_format = 'DYNAMIC';
-        EOF
+        # Note: MySQL server configuration (character set, collation, row format) is set
+        # at container startup via custom entrypoint script that passes command-line arguments
+        # to mysqld, similar to how mirromutth/mysql-action works.
         # Ensure user exists and has proper privileges
         mysql -u root -proot_password -h 127.0.0.1 mysql <<EOF
         CREATE USER IF NOT EXISTS 'evennia'@'%' IDENTIFIED BY 'password';
diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml
index be52ef8848..77cd6394a1 100644
--- a/.github/workflows/github_action_test_suite.yml
+++ b/.github/workflows/github_action_test_suite.yml
@@ -71,6 +71,9 @@ jobs:
           --health-interval=10s
           --health-timeout=5s
           --health-retries=3
+          --entrypoint="/bin/bash"
+          -c
+          "printf '#!/bin/bash\nexec /usr/local/bin/docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb-default-row-format=DYNAMIC \"\$@\"\n' > /tmp/mysql-entrypoint.sh && chmod +x /tmp/mysql-entrypoint.sh && exec /tmp/mysql-entrypoint.sh"
     steps:
       - uses: actions/checkout@v4