From 147266fb7ecbf7b652616ea5ffddaab77a45a0f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= <ole.andre.rodlie@gmail.com>
Date: Sun, 11 Aug 2024 06:03:23 +0200
Subject: [PATCH] Update Windows CI

---
 .github/workflows/windows.yml | 18 ++++++++++++++----
 src/scripts/build_ci.bat      | 18 +++++++++++++-----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 347d6926e..9cdefc91d 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -3,10 +3,8 @@ name: Windows
 on: [push, pull_request]
 
 jobs:
-  build:
-
+  release:
     runs-on: windows-2019
-
     steps:
     - uses: actions/checkout@v3
     - name: Build
@@ -15,5 +13,17 @@ jobs:
     - name: Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: friction-ci-${{github.sha}}-windows-x64
+        name: friction-ci-windows-x64
+        path: build\output\*.7z
+  debug:
+    runs-on: windows-2019
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build
+      shell: cmd
+      run: .\src\scripts\build_ci.bat debug
+    - name: Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: friction-ci-debug-windows-x64
         path: build\output\*.7z
diff --git a/src/scripts/build_ci.bat b/src/scripts/build_ci.bat
index e097cd57b..2a2b058c1 100644
--- a/src/scripts/build_ci.bat
+++ b/src/scripts/build_ci.bat
@@ -6,10 +6,18 @@ REM # GPLv3+
 
 set OPT=%1
 set REL=OFF
+set BTYPE=Release
+set BDIR=release
+
 if "%OPT%" == "release" (
     set REL=ON
 )
 
+if "%OPT%" == "debug" (
+    set BTYPE=Debug
+    set BDIR=debug
+)
+
 set CWD=%cd%
 set SDK_DIR=%CWD%\sdk
 set SDK_VERSION=20240805
@@ -37,9 +45,9 @@ mkdir build
 cd "%CWD%\build"
 mkdir output
 
-cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=%SDK_DIR% -DBUILD_ENGINE=OFF -DFRICTION_OFFICIAL_RELEASE=%REL% -DWIN_DEPLOY=ON -DGIT_COMMIT=%COMMIT% -DGIT_BRANCH=%BRANCH% ..
+cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=%BTYPE% -DCMAKE_PREFIX_PATH=%SDK_DIR% -DBUILD_ENGINE=OFF -DFRICTION_OFFICIAL_RELEASE=%REL% -DWIN_DEPLOY=ON -DGIT_COMMIT=%COMMIT% -DGIT_BRANCH=%BRANCH% ..
 set /p VERSION=<version.txt
-cmake --build . --config Release
+cmake --build . --config %BTYPE%
 
 if "%REL%" == "OFF" (
     set VERSION="%VERSION%-%COMMIT%"
@@ -50,9 +58,9 @@ mkdir "%OUTPUT_DIR%"
 mkdir "%OUTPUT_DIR%\audio"
 mkdir "%OUTPUT_DIR%\platforms"
 
-copy "%CWD%\build\src\core\release\frictioncore.dll" "%OUTPUT_DIR%\"
-copy "%CWD%\build\src\ui\release\frictionui.dll" "%OUTPUT_DIR%\"
-copy "%CWD%\build\src\app\release\friction.exe" "%OUTPUT_DIR%\"
+copy "%CWD%\build\src\core\%BDIR%\frictioncore.dll" "%OUTPUT_DIR%\"
+copy "%CWD%\build\src\ui\%BDIR%\frictionui.dll" "%OUTPUT_DIR%\"
+copy "%CWD%\build\src\app\%BDIR%\friction.exe" "%OUTPUT_DIR%\"
 copy "%SDK_DIR%\bin\svgo-win.exe" "%OUTPUT_DIR%\"
 copy "%SDK_DIR%\bin\skia.dll" "%OUTPUT_DIR%\"
 copy "%SDK_DIR%\bin\Qt5Core.dll" "%OUTPUT_DIR%\"