Switch over to mariadb

edgegamers · Aug 31, 2024 · 471181f · 471181f
1 parent 67ccf05
commit 471181f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -15,13 +15,12 @@ jobs:
 
     services:
       mysql:
-        image: mysql:latest
+        image: mariadb:latest
         env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: gang
+          MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes
+          MARIADB_DATABASE: gangs
         ports:
           - 3306:3306
-        options: --health-cmd="mysqladmin ping --silent" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
       - uses: actions/checkout@v4
@@ -39,13 +38,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-nuget-
 
-      - name: Wait for MySQL
-        run: |
-          until mysqladmin ping -h "localhost" --silent; do
-            echo "Waiting for database connection..."
-            sleep 2
-          done
-
       - name: Restore dependencies
         run: dotnet restore
 

diff --git a/GangsTest/StatTests/StatManagerData.cs b/GangsTest/StatTests/StatManagerData.cs
@@ -9,7 +9,7 @@ namespace GangsTest.StatTests;
 public class StatManagerData : IEnumerable<object[]> {
   private readonly IBehavior[] behaviors = [
     new MockStatManager(),
-    new SQLStatManager("Server=localhost;User=root;Database=gang",
+    new SQLStatManager("Server=localhost;User=root;Database=gangs",
       "gang_unit_test"),
     new SQLiteStatManager("Data Source=:memory:", "gang_unit_test")
   ];