From 2d83be6b5dd85ae8564215ad5cc6e8fe35b691a9 Mon Sep 17 00:00:00 2001
From: Danny Bierek <dannybierek@gmail.com>
Date: Sat, 13 Jun 2026 23:14:29 -0700
Subject: [PATCH 1/3] Fix build workflow

---
 .github/workflows/build.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index df7dfb9..b70a8f8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,6 +11,9 @@ jobs:
   validate_build:
     name: Validate Build
     runs-on: windows-latest
+    env:
+      VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg_cache
+
     strategy:
       matrix:
         config: [ debug, release ]
@@ -28,16 +31,13 @@ jobs:
       - name: Restore vcpkg cache
         uses: actions/cache@v4
         with:
-          path: ${{ github.workspace }}/extern/vcpkg/packages
+          path: |
+            ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
+            vcpkg_installed/
           key: vcpkg-${{ runner.os }}-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
           restore-keys: |
             vcpkg-${{ runner.os }}-
             
-      - name: Setup VS environment
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: x64
-
       - name: Build ${{ matrix.config }}
         run: |
           cmake --preset x64-${{ matrix.config }}
@@ -54,6 +54,9 @@ jobs:
     name: Create Release with MSI
     runs-on: windows-latest
     if: startsWith(github.ref, 'refs/tags/v')
+    env:
+      VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg_cache
+
     needs: validate_build
 
     permissions:
@@ -73,16 +76,13 @@ jobs:
       - name: Restore vcpkg cache
         uses: actions/cache@v4
         with:
-          path: ${{ github.workspace }}/extern/vcpkg/packages
+          path: |
+            ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
+            vcpkg_installed/
           key: vcpkg-${{ runner.os }}-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
           restore-keys: |
             vcpkg-${{ runner.os }}-
 
-      - name: Setup VS environment
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: x64
-
       - name: Install WiX v6 Toolset from MSI
         shell: pwsh
         run: |

From f4d41449d7b069187c8001bea1836734b5be3f54 Mon Sep 17 00:00:00 2001
From: Danny Bierek <dannybierek@gmail.com>
Date: Sat, 13 Jun 2026 23:23:19 -0700
Subject: [PATCH 2/3] Create vcpkg cache directory in workflow

---
 .github/workflows/build.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b70a8f8..c659bc7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,6 +38,10 @@ jobs:
           restore-keys: |
             vcpkg-${{ runner.os }}-
             
+      - name: Create vcpkg cache directory
+        run: |
+          mkdir -p ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
+
       - name: Build ${{ matrix.config }}
         run: |
           cmake --preset x64-${{ matrix.config }}
@@ -83,6 +87,10 @@ jobs:
           restore-keys: |
             vcpkg-${{ runner.os }}-
 
+      - name: Create vcpkg cache directory
+        run: |
+          mkdir -p ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
+
       - name: Install WiX v6 Toolset from MSI
         shell: pwsh
         run: |

From 2979de04ad649485ac52d837c61c51bedd76e0a5 Mon Sep 17 00:00:00 2001
From: Danny Bierek <dannybierek@gmail.com>
Date: Sat, 13 Jun 2026 23:56:26 -0700
Subject: [PATCH 3/3] Use VS 2022

---
 .github/workflows/build.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c659bc7..94c23aa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,9 +10,9 @@ on:
 jobs:
   validate_build:
     name: Validate Build
-    runs-on: windows-latest
+    runs-on: windows-2022
     env:
-      VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg_cache
+      VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}\vcpkg_cache
 
     strategy:
       matrix:
@@ -39,8 +39,8 @@ jobs:
             vcpkg-${{ runner.os }}-
             
       - name: Create vcpkg cache directory
-        run: |
-          mkdir -p ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
+        shell: pwsh
+        run: New-Item -Path "${{ env.VCPKG_DEFAULT_BINARY_CACHE }}" -ItemType Directory -Force
 
       - name: Build ${{ matrix.config }}
         run: |
@@ -56,10 +56,10 @@ jobs:
 
   create_release:
     name: Create Release with MSI
-    runs-on: windows-latest
+    runs-on: windows-2022
     if: startsWith(github.ref, 'refs/tags/v')
     env:
-      VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg_cache
+      VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}\vcpkg_cache
 
     needs: validate_build
 
@@ -88,8 +88,8 @@ jobs:
             vcpkg-${{ runner.os }}-
 
       - name: Create vcpkg cache directory
-        run: |
-          mkdir -p ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
+        shell: pwsh
+        run: New-Item -Path "${{ env.VCPKG_DEFAULT_BINARY_CACHE }}" -ItemType Directory -Force
 
       - name: Install WiX v6 Toolset from MSI
         shell: pwsh