From 4abd9c1b40b673b33d68c42ad1e58ea12867cd69 Mon Sep 17 00:00:00 2001
From: KimLS <KimLS@peqtgc.com>
Date: Tue, 28 Apr 2026 18:01:20 -0700
Subject: [PATCH 1/4] Some build changes, may or may not fix cache

---
 .github/workflows/build.yaml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c01b67a73..72e1a8bcf 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -5,11 +5,13 @@ on:
       - master
       - develop
   pull_request:
-
 jobs:
   linux:
     name: Linux
     runs-on: ubuntu-latest
+    env:
+      VCPKG_DOWNLOADS: ${{ github.workspace }}/submodules/vcpkg/downloads
+      VCPKG_BINARY_SOURCES: 'clear;files,${{ github.workspace }}/vcpkg_archives,readwrite'
     steps:
       - name: Checkout source
         uses: actions/checkout@v5
@@ -30,11 +32,10 @@ jobs:
         uses: actions/cache@v5
         with:
           path: |
-            vcpkg_installed
-            submodules/vcpkg/downloads
+            ${{ env.VCPKG_DOWNLOADS }}
+            ${{ github.workspace }}/vcpkg_archives
           key: ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
-            ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json') }}-
             ${{ runner.os }}-vcpkg-
 
       - name: Configure
@@ -59,6 +60,9 @@ jobs:
   windows:
     name: Windows
     runs-on: windows-latest
+    env:
+      VCPKG_DOWNLOADS: ${{ github.workspace }}\submodules\vcpkg\downloads
+      VCPKG_BINARY_SOURCES: 'clear;files,${{ github.workspace }}\vcpkg_archives,readwrite'
     steps:
       - name: Checkout source
         uses: actions/checkout@v5
@@ -77,11 +81,10 @@ jobs:
         uses: actions/cache@v5
         with:
           path: |
-            vcpkg_installed
-            submodules/vcpkg/downloads
+            ${{ env.VCPKG_DOWNLOADS }}
+            ${{ github.workspace }}/vcpkg_archives
           key: ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
-            ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json') }}-
             ${{ runner.os }}-vcpkg-
 
       - name: Configure

From cabe06ea92853634dd55d6dcc2fffde256c963c3 Mon Sep 17 00:00:00 2001
From: KimLS <KimLS@peqtgc.com>
Date: Tue, 28 Apr 2026 19:42:26 -0700
Subject: [PATCH 2/4] Revert linux part for now

---
 .github/workflows/build.yaml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72e1a8bcf..0bf0acb95 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -9,9 +9,6 @@ jobs:
   linux:
     name: Linux
     runs-on: ubuntu-latest
-    env:
-      VCPKG_DOWNLOADS: ${{ github.workspace }}/submodules/vcpkg/downloads
-      VCPKG_BINARY_SOURCES: 'clear;files,${{ github.workspace }}/vcpkg_archives,readwrite'
     steps:
       - name: Checkout source
         uses: actions/checkout@v5
@@ -32,10 +29,11 @@ jobs:
         uses: actions/cache@v5
         with:
           path: |
-            ${{ env.VCPKG_DOWNLOADS }}
-            ${{ github.workspace }}/vcpkg_archives
+            vcpkg_installed
+            submodules/vcpkg/downloads
           key: ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
+            ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json') }}-
             ${{ runner.os }}-vcpkg-
 
       - name: Configure

From 42d600446731eebf741bbdce4c73b492b297061c Mon Sep 17 00:00:00 2001
From: KimLS <KimLS@peqtgc.com>
Date: Tue, 28 Apr 2026 20:00:01 -0700
Subject: [PATCH 3/4] Remove step i think isn't required for windows, change
 linux path

---
 .github/workflows/build.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0bf0acb95..890becf75 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -29,7 +29,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: |
-            vcpkg_installed
+            build/vcpkg_installed
             submodules/vcpkg/downloads
           key: ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
@@ -70,11 +70,6 @@ jobs:
       - name: Enable long paths
         run: git config --global core.longpaths true
 
-      - name: Setup MSVC environment
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: x64
-
       - name: Restore vcpkg Cache
         uses: actions/cache@v5
         with:

From c6ddf300a4e2badf5ef284b630b25a3bb6a246c0 Mon Sep 17 00:00:00 2001
From: KimLS <KimLS@peqtgc.com>
Date: Tue, 28 Apr 2026 20:15:06 -0700
Subject: [PATCH 4/4] Add back msvc step with a maintained fork

---
 .github/workflows/build.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 890becf75..7c1882292 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -69,6 +69,11 @@ jobs:
 
       - name: Enable long paths
         run: git config --global core.longpaths true
+        
+      - name: Setup MSVC environment
+        uses: TheMrMilchmann/setup-msvc-dev@v4
+        with:
+          arch: x64
 
       - name: Restore vcpkg Cache
         uses: actions/cache@v5