meh

.github/workflows/build-targets.yml

@@ -6,7 +6,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-       target: [windows-multi-x64]
+        configurePreset: [ninja-msvc-x64, msbuild-x64]
+        include:
+          - configurePreset: ninja-msvc-x64
+            buildPreset: ninja-msvc-x64-release
+            should_upload: true
+          - configurePreset: msbuild-x64
+            buildPreset: msbuild-x64-release
+            should_upload: false
 
     steps:
     - name: Check out code
@@ -15,21 +22,25 @@ jobs:
         submodules: true
         fetch-tags: true
 
-    - name: Setup vcpkg (it does not install any package yet)
+    - name: Fetch cmake & ninja
+      uses: lukka/get-cmake@latest
+
+    - name: Bootstrap VCPKG
       uses: lukka/run-vcpkg@v11
 
-    - name: Run CMake
+    - name: Build
       uses: lukka/run-cmake@v10
       with:
-        configurePreset: "msbuild-vcpkg-x64"
-        buildPreset: "msbuild-vcpkg-x64-release"
+        configurePreset: ${{ matrix.configurePreset }}
+        buildPreset: ${{ matrix.buildPreset }}
 
     - name: Archive client
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ matrix.target }}
-        path: "cmake-build-presets/msbuild-vcpkg-x64/Release/ezquake.exe"
+        name: ${{ matrix.configurePreset }}
+        path: "cmake-build-presets/${{ matrix.configurePreset }}/Release/ezquake.exe"
         compression-level: 9
+      if: ${{ matrix.should_upload }}
 
   macos-build:
     runs-on: macos-13
@@ -48,18 +59,20 @@ jobs:
     - name: Install build system dependencies
       run: brew install autoconf automake libtool
 
+    - uses: lukka/get-cmake@latest
+
     - name: Setup vcpkg
       uses: lukka/run-vcpkg@v11
 
     - name: Run CMake
       uses: lukka/run-cmake@v10
       with:
-        configurePreset: "xcode-vcpkg-${{ matrix.arch }}-${{ matrix.variant }}-ci"
-        buildPreset: "xcode-vcpkg-${{ matrix.arch }}-${{ matrix.variant }}-ci"
+        configurePreset: "xcode-${{ matrix.arch }}-${{ matrix.variant }}-ci"
+        buildPreset: "xcode-${{ matrix.arch }}-${{ matrix.variant }}-ci"
 
     - name: Prepare upload
       run: zip -r ../../../ezQuake.zip ezQuake.app
-      working-directory: "cmake-build-presets/xcode-vcpkg-${{ matrix.arch }}-${{ matrix.variant }}-ci/${{ matrix.variant }}"
+      working-directory: "cmake-build-presets/xcode-${{ matrix.arch }}-${{ matrix.variant }}-ci/${{ matrix.variant }}"
 
     - name: Upload Build Artifact
       uses: actions/upload-artifact@v4

.gitignore

@@ -12,5 +12,6 @@ SysPrintf.log
 *.glsl.c
 vcpkg_installed/
 src/.msversion.h
+cmake-build-presets
 
 !.gitignore