From 609b646e45edd65a17f16e9ae24d0e513700c746 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 27 Jun 2024 22:13:40 +0200
Subject: [PATCH] Revert CI experiments

---
 .github/actions/setup-database/action.yml     |  6 ++---
 .../workflows/github_action_test_suite.yml    | 14 +++-------
 .github/workflows/mysql_settings.py           | 26 +++++++++----------
 .github/workflows/postgresql_settings.py      |  7 ++---
 4 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/.github/actions/setup-database/action.yml b/.github/actions/setup-database/action.yml
index efcf35c8f1..d5491525de 100644
--- a/.github/actions/setup-database/action.yml
+++ b/.github/actions/setup-database/action.yml
@@ -26,7 +26,7 @@ runs:
         postgresql version: "12"
         postgresql db: "evennia"
         postgresql user: "evennia"
-        postgresql password: "evennia"
+        postgresql password: "password"
 
     - name: Wait for PostgreSQL to activate
       if: ${{ inputs.database == 'postgresql' }}
@@ -50,7 +50,7 @@ runs:
         collation server: "utf8_general_ci"
         mysql database: "evennia"
         mysql user: "evennia"
-        mysql password: "evennia"
+        mysql password: "password"
         mysql root password: root_password
 
     - name: Wait for MySQL to activate
@@ -68,7 +68,7 @@ runs:
       if: ${{ inputs.database == 'mysql' }}
       run: |
         cat <<EOF | mysql -u root -proot_password -h 127.0.0.1 mysql
-          create user 'evennia'@'%' identified by 'evennia';
+          create user 'evennia'@'%' identified by 'password';
           grant all on \`evennia%\`.* to 'evennia'@'%';
           grant process on *.* to 'evennia'@'%';
           flush privileges
diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml
index 5b5932b269..c05faa95a5 100644
--- a/.github/workflows/github_action_test_suite.yml
+++ b/.github/workflows/github_action_test_suite.yml
@@ -19,24 +19,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
         TESTING_DB: ["sqlite3", "postgresql", "mysql"]
         include:
           - python-version: "3.10"
             TESTING_DB: "sqlite3"
             coverage-test: true
 
-    timeout-minutes: 40
+    timeout-minutes: 35
 
     env:
-      UNIT_TEST_SETTINGS: "--settings=settings --keepdb --timing --parallel auto"
+      UNIT_TEST_SETTINGS: "--settings=settings --keepdb --timing"
       COVERAGE_TEST_SETTINGS: "--settings=settings --timing"
 
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up {{ matrix.TESTING_DB }} database
-        if: ${{ matrix.TESTING_DB == 'mysql' }}
+      - name: Set up database (${{ matrix.TESTING_DB }})
         uses: ./.github/actions/setup-database
         with:
           database: ${{ matrix.TESTING_DB }}
@@ -75,11 +74,6 @@ jobs:
         working-directory: testing_mygame
         run: |
           evennia test ${{ env.UNIT_TEST_SETTINGS }} evennia
-        env:
-          POSTGRES_HOST: localhost
-          POSTGRES_PORT: 5432
-          MYSQL_HOST: 127.0.0.1
-          MYSQL_PORT: 3306
 
       # OBS - it's important to not run the coverage tests with --parallel, it messes up the coverage
       # calculation!
diff --git a/.github/workflows/mysql_settings.py b/.github/workflows/mysql_settings.py
index 16fdb74b9e..b5525dcd74 100644
--- a/.github/workflows/mysql_settings.py
+++ b/.github/workflows/mysql_settings.py
@@ -43,20 +43,20 @@ DATABASES = {
         "ENGINE": "django.db.backends.mysql",
         "NAME": "evennia",
         "USER": "evennia",
-        "PASSWORD": "evennia",
-        "HOST": os.environ.get("MYSQL_HOST", "127.0.0.1"),
-        "PORT": os.environ.get("MYSQL_PORT", "3306"),
+        "PASSWORD": "password",
+        "HOST": "127.0.0.1",
+        "PORT": "",  # use default port
         "OPTIONS": {
-             "charset": "utf8mb4",
-             "init_command": "set collation_connection=utf8mb4_unicode_ci",
-         },
-#         "TEST": {
-#             "NAME": "evennia",
-#             "OPTIONS": {
-#                 "charset": "utf8mb4",
-#                 "init_command": "set collation_connection=utf8mb4_unicode_ci",
-#             },
-#         },
+            "charset": "utf8mb4",
+            "init_command": "set collation_connection=utf8mb4_unicode_ci",
+        },
+        "TEST": {
+            "NAME": "evennia",
+            "OPTIONS": {
+                "charset": "utf8mb4",
+                "init_command": "set collation_connection=utf8mb4_unicode_ci",
+            },
+        },
     }
 }
 
diff --git a/.github/workflows/postgresql_settings.py b/.github/workflows/postgresql_settings.py
index 2e5ad4c4e6..c12927af3a 100644
--- a/.github/workflows/postgresql_settings.py
+++ b/.github/workflows/postgresql_settings.py
@@ -43,9 +43,10 @@ DATABASES = {
         "ENGINE": "django.db.backends.postgresql",
         "NAME": "evennia",
         "USER": "evennia",
-        "PASSWORD": "evennia",
-        "HOST": os.environ.get("POSTGRES_HOST", "localhost"),
-        "PORT": os.environ.get("POSTGRES_PORT", "5432"),
+        "PASSWORD": "password",
+        "HOST": "localhost",
+        "PORT": "",  # use default
+        "TEST": {"NAME": "default"},
     }
 }