From f13f1eb5d95035167822a644b8870315c6262d84 Mon Sep 17 00:00:00 2001
From: David Li <jiawei.davidli@gmail.com>
Date: Thu, 9 Jan 2025 18:45:02 -0800
Subject: [PATCH] ci: Standardize MSVC build process

  Both the nightly release and manual-release builds use
  `msbuild`, while the CI job for PRs use `cmake`. This
  leads to a weird situation where both the release builds
  run without issue, but the CI job fails.

Signed-off-by: David Li <jiawei.davidli@gmail.com>
---
 ...full-features-cmake.yml => msvc-full-features.yml} | 11 +++--------
 .github/workflows/release.yml                         |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)
 rename .github/workflows/{msvc-full-features-cmake.yml => msvc-full-features.yml} (89%)

diff --git a/.github/workflows/msvc-full-features-cmake.yml b/.github/workflows/msvc-full-features.yml
similarity index 89%
rename from .github/workflows/msvc-full-features-cmake.yml
rename to .github/workflows/msvc-full-features.yml
index 7f775d15e4cc..3b8bd046fb24 100644
--- a/.github/workflows/msvc-full-features-cmake.yml
+++ b/.github/workflows/msvc-full-features.yml
@@ -1,4 +1,4 @@
-name: Cataclysm Windows build (CMake + MSVC)
+name: Cataclysm Windows build (MSVC)
 
 on:
   push:
@@ -34,7 +34,7 @@ on:
 
 # We only care about the latest revision, so cancel previous instances.
 concurrency:
-  group: msvc-cmake-build-${{ github.ref_name }}
+  group: msvc-build-${{ github.ref_name }}
   cancel-in-progress: true
 
 env:
@@ -84,15 +84,10 @@ jobs:
       run: |
         vcpkg integrate install
 
-    - uses: ammaraskar/msvc-problem-matcher@master
-    - name: Configure
-      run: |
-          cmake -DTESTS=ON --preset $env:CMAKE_PRESET
-
     - uses: ammaraskar/msvc-problem-matcher@master
     - name: Build
       run: |
-          cmake --build out/build/$env:CMAKE_PRESET --config RelWithDebInfo
+          msbuild -m -p:Configuration=Release -p:Platform=x64 "-target:Cataclysm-vcpkg-static;JsonFormatter-vcpkg-static;Cataclysm-test-vcpkg-static" msvc-full-features\Cataclysm-vcpkg-static.sln
 
     - name: Dump logs if build failed
       if: failure()
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8472186a50fe..7b2233fba645 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -225,7 +225,7 @@ jobs:
         uses: lukka/get-cmake@latest
 
       - name: Install vcpkg
-        uses: lukka/run-vcpkg@v11
+        uses: lukka/run-vcpkg@main
         id: runvcpkg
         with:
           vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'