few more discrepencies to fix

Black-Tek · Nov 30, 2024 · 2d1e164 · 2d1e164
1 parent 9c4fdd5
commit 2d1e164
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 24 deletions.
diff --git a/.github/workflows/linux_build_runner.yml b/.github/workflows/linux_build_runner.yml
@@ -9,13 +9,13 @@ jobs:
       matrix:
         os: [ubuntu-24.04, ubuntu-22.04]
         configuration:
-          - ReleaseDynamic
-          - ReleaseStatic
-          - DebugDynamic
-          - DebugStatic
+          - releasedynamic
+          - releasestatic
+          - debugdynamic
+          - debugstatic
         platform:
           - 64
-          - ARM64
+          - arm64
 
     runs-on: ${{ matrix.os }}
 
@@ -52,8 +52,7 @@ jobs:
 
     - name: Build Project
       run: |
-        make help
-        make -j $(nproc)
+        make -j $(nproc) config="${{ matrix.configuration }}_${{ matrix.platform }}"
 
     - name: Create and Upload Artifact
       if: ${{ github.event_name != 'pull_request' }}

diff --git a/.github/workflows/windows_build_runner.yml b/.github/workflows/windows_build_runner.yml
@@ -9,10 +9,10 @@ jobs:
       matrix:
         os: [windows-2022]
         configuration: 
-          - ReleaseDynamic
-          - ReleaseStatic
-          - DebugDynamic
-          - DebugStatic
+          - releasedynamic
+          - releasestatic
+          - debugdynamic
+          - debugstatic
         include:
           - os: windows-2022
             triplet: x64-windows
@@ -34,27 +34,24 @@ jobs:
           cmd /c Bootstrap.bat
           move .\bin\release\premake5.exe D:\a\BlackTek-Server\BlackTek-Server\premake5.exe
           cd D:\a\BlackTek-Server\BlackTek-Server
-
       - name: Generate Solution
         run: |
           D:\a\BlackTek-Server\BlackTek-Server\premake5.exe vs2022
-
       - name: Install Dependencies
+        shell: pwsh
         run: |
-          if [[ "${{ matrix.configuration }}" == *Static ]]; then
-            vcpkg install --triplet=x64-windows-static
-          else
-            vcpkg install
-          fi
-
+          if (${{ matrix.configuration }} -like '*Static') {
+            & "vcpkg" install --triplet=x64-windows-static
+          } else {
+            & "vcpkg" install
+          }
       - name: Build Project
         run: |
           cd D:\a\BlackTek-Server\BlackTek-Server
           msbuild Black-Tek-Server.sln /p:Configuration=${{ matrix.configuration }}
-
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
           name: BlackTek-Server-${{ matrix.os }}-${{ matrix.configuration }}
           path: |
-            Black-Tek-Server.exe
+            Black-Tek-Server.exe
diff --git a/premake5.lua b/premake5.lua
@@ -1,7 +1,6 @@
 workspace "Black-Tek-Server"
    -- Configurations now include dynamic variants
    configurations { 
-      "Debug", "Release", 
       "DebugStatic", "ReleaseStatic", 
       "DebugDynamic", "ReleaseDynamic" 
    }
@@ -32,7 +31,7 @@ workspace "Black-Tek-Server"
       end
 
       -- Debug configurations
-      filter ("configurations:Debug", "configurations:DebugStatic", "configurations:DebugDynamic")
+      filter ("configurations:DebugStatic", "configurations:DebugDynamic")
          defines { "DEBUG" }
          runtime "Debug"
          symbols "On"
@@ -42,7 +41,7 @@ workspace "Black-Tek-Server"
       filter {}
 
       -- Release configurations
-      filter ("configurations:Release", "configurations:ReleaseStatic", "configurations:ReleaseDynamic")
+      filter ("configurations:ReleaseStatic", "configurations:ReleaseDynamic")
          defines { "NDEBUG" }
          runtime "Release"
          symbols "Off"