From cb0994c88b56baf8129df44e2ff88c7556c00c49 Mon Sep 17 00:00:00 2001
From: MSWS <imodmaker@gmail.com>
Date: Fri, 30 Aug 2024 22:46:32 -0700
Subject: [PATCH] Revert revert

---
 .github/workflows/dotnet.yml | 50 +++++++-----------------------------
 1 file changed, 9 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 0f7885e..1ef2c6d 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -5,25 +5,22 @@ on:
   pull_request:
 
 jobs:
-  setup-db:
+  build:
+
     runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        dotnet-version: [ 6.0.x, 7.0.x, 8.0.x, 9.0.x ] # Test on multiple .NET versions
+
     services:
-      mariadb:
+      mysql:
         image: mariadb:latest
         env:
           MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes
           MARIADB_DATABASE: gangs
         ports:
           - 3306:3306
-    steps:
-      - name: Database setup complete
-        run: echo "Database setup complete"
-
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dotnet-version: [ 6.0.x, 7.0.x, 8.0.x, 9.0.x ] # Test on multiple .NET versions
 
     steps:
       - uses: actions/checkout@v4
@@ -40,40 +37,11 @@ jobs:
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
           restore-keys: |
             ${{ runner.os }}-nuget-
-
       - name: Restore dependencies
         run: dotnet restore
 
       - name: Build
         run: dotnet build --no-restore
 
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-output
-          path: |
-            **/bin/**/*.dll
-            **/bin/**/*.pdb
-
-  test:
-    runs-on: ubuntu-latest
-    needs: [ setup-db, build ]
-    strategy:
-      matrix:
-        dotnet-version: [ 6.0.x, 7.0.x, 8.0.x, 9.0.x ] # Test on multiple .NET versions
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: ${{ matrix.dotnet-version }}
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: build-output
-
       - name: Test
-        run: dotnet test GangsTest/GangsTest.csproj --no-build --verbosity normal
+        run: dotnet test GangsTest/GangsTest.csproj --no-build --verbosity normal
\ No newline at end of file