From 3c52981bbe398cb619dd57a2ee6d5cf601498b59 Mon Sep 17 00:00:00 2001 From: Griatch Date: Mon, 22 Dec 2025 09:48:41 +0100 Subject: [PATCH] CI: fix myslq.cni file init syntax --- .github/actions/run-tests/action.yml | 3 ++- .github/actions/setup-database/action.yml | 3 +++ .github/workflows/github_action_test_suite.yml | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml index 000d0c6a85..e2d8d8e670 100644 --- a/.github/actions/run-tests/action.yml +++ b/.github/actions/run-tests/action.yml @@ -69,7 +69,8 @@ runs: - name: Verify MySQL settings before migrations if: ${{ inputs.testing-db == 'mysql' }} run: | - mysql -h 127.0.0.1 -u evennia -ppassword evennia -e "SELECT @@innodb_default_row_format as row_format;" + echo "Verifying MySQL server settings:" + mysql -u evennia -ppassword evennia -e "SELECT @@innodb_default_row_format as row_format, @@character_set_server as charset, @@collation_server as collation, @@innodb_large_prefix as large_prefix;" shell: bash - name: Run migrations diff --git a/.github/actions/setup-database/action.yml b/.github/actions/setup-database/action.yml index 530e009bc5..f1c856fc3f 100644 --- a/.github/actions/setup-database/action.yml +++ b/.github/actions/setup-database/action.yml @@ -64,6 +64,9 @@ runs: GRANT SESSION_VARIABLES_ADMIN ON *.* TO 'evennia'@'::1'; FLUSH PRIVILEGES; EOF + # Verify MySQL settings are applied correctly + echo "Verifying MySQL configuration:" + mysql -u root -proot_password -e "SELECT @@innodb_default_row_format as row_format, @@character_set_server as charset, @@collation_server as collation;" || true shell: bash # get logs from db start diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml index 8796246883..b8566f6893 100644 --- a/.github/workflows/github_action_test_suite.yml +++ b/.github/workflows/github_action_test_suite.yml @@ -70,7 +70,8 @@ jobs: [mysqld] character-set-server=utf8mb4 collation-server=utf8mb4_unicode_ci - innodb-default-row-format=DYNAMIC + innodb_default_row_format=DYNAMIC + innodb_large_prefix=ON - name: Set up database (mysql) uses: ./.github/actions/setup-database