Testing to clean up mysql action too

.github/workflows/github_action_test_suite.yml

@@ -36,9 +36,9 @@ jobs:
       postgres:
         image: postgres:12
         env:
-          POSTGRES_USER: postgres
+          POSTGRES_USER: evennia
-          POSTGRES_PASSWORD: postgres
           POSTGRES_DB: evennia
+          POSTGRES_PASSWORD: evennia
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -47,15 +47,31 @@ jobs:
         ports:
           - 5432:5432
 
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD: root_password
+          MYSQL_DATABASE: evennia
+          MYSQL_USER: evennia
+          MYSQL_PASSWORD: evennia
+        options: >-
+          --health-cmd "mysqladmin ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+          --charset "utf8mb4"
+          --init_command "set collation_connection=utf8mb4_unicode_ci"
+        ports:
+          - 3306:3306
+
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up database (${{ matrix.TESTING_DB }})
+      # - name: Set up database (${{ matrix.TESTING_DB }})
-        if: matrix.TESTING_DB != 'postgresql'
+      #   uses: ./.github/actions/setup-database
-        uses: ./.github/actions/setup-database
+      #   with:
-        with:
+      #     database: ${{ matrix.TESTING_DB }}
-          database: ${{ matrix.TESTING_DB }}
+      #   timeout-minutes: 5
-        timeout-minutes: 5
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
@@ -93,6 +109,8 @@ jobs:
         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!

.github/workflows/mysql_settings.py

@@ -43,20 +43,20 @@ DATABASES = {
         "ENGINE": "django.db.backends.mysql",
         "NAME": "evennia",
         "USER": "evennia",
-        "PASSWORD": "password",
+        "PASSWORD": "evennia",
-        "HOST": "127.0.0.1",
+        "HOST": os.environ.get("MYSQL_HOST", "127.0.0.1"),
-        "PORT": "",  # use default port
+        "PORT": os.environ.get("MYSQL_PORT", "3306"),
-        "OPTIONS": {
+#         "OPTIONS": {
-            "charset": "utf8mb4",
+#             "charset": "utf8mb4",
-            "init_command": "set collation_connection=utf8mb4_unicode_ci",
+#             "init_command": "set collation_connection=utf8mb4_unicode_ci",
-        },
+#         },
-        "TEST": {
+#         "TEST": {
-            "NAME": "evennia",
+#             "NAME": "evennia",
-            "OPTIONS": {
+#             "OPTIONS": {
-                "charset": "utf8mb4",
+#                 "charset": "utf8mb4",
-                "init_command": "set collation_connection=utf8mb4_unicode_ci",
+#                 "init_command": "set collation_connection=utf8mb4_unicode_ci",
-            },
+#             },
-        },
+#         },
     }
 }
 

.github/workflows/postgresql_settings.py

@@ -42,8 +42,8 @@ DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql",
         "NAME": "evennia",
-        "USER": "postgres",  # evennia
+        "USER": "evennia",
-        "PASSWORD": "postgres",
+        "PASSWORD": "evennia",
         "HOST": os.environ.get("POSTGRES_HOST", "localhost"),
         "PORT": os.environ.get("POSTGRES_PORT", "5432"),
     }