From d34332cd1b4fd354628e961f926c45036a5b1765 Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 19 Dec 2023 07:16:02 +0100 Subject: [PATCH] Revert CI build changes for more testing --- .github/actions/setup-database/action.yml | 2 +- .github/workflows/github_action_test_suite.yml | 2 +- .github/workflows/mysql_settings.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/setup-database/action.yml b/.github/actions/setup-database/action.yml index 50d91d0e81..d5491525de 100644 --- a/.github/actions/setup-database/action.yml +++ b/.github/actions/setup-database/action.yml @@ -48,7 +48,7 @@ runs: # collation server: "utf8mb4_unicode_ci" character set server: "utf8" collation server: "utf8_general_ci" - mysql database: "testdb" + mysql database: "evennia" mysql user: "evennia" mysql password: "password" mysql root password: root_password diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml index 42b4235c28..cab529dcf6 100644 --- a/.github/workflows/github_action_test_suite.yml +++ b/.github/workflows/github_action_test_suite.yml @@ -29,7 +29,7 @@ jobs: timeout-minutes: 35 env: - UNIT_TEST_SETTINGS: "--settings=settings --timing" + UNIT_TEST_SETTINGS: "--settings=settings --keepdb --parallel 4 --timing" COVERAGE_TEST_SETTINGS: "--settings=settings --timing" steps: diff --git a/.github/workflows/mysql_settings.py b/.github/workflows/mysql_settings.py index 8ad7a088a7..b5525dcd74 100644 --- a/.github/workflows/mysql_settings.py +++ b/.github/workflows/mysql_settings.py @@ -41,7 +41,7 @@ SERVERNAME = "testing_mygame" DATABASES = { "default": { "ENGINE": "django.db.backends.mysql", - "NAME": "evennia1", + "NAME": "evennia", "USER": "evennia", "PASSWORD": "password", "HOST": "127.0.0.1", @@ -51,7 +51,7 @@ DATABASES = { "init_command": "set collation_connection=utf8mb4_unicode_ci", }, "TEST": { - "NAME": "evennia1", + "NAME": "evennia", "OPTIONS": { "charset": "utf8mb4", "init_command": "set collation_connection=utf8mb4_unicode_ci",