From 18bb82fa11a171d4ebb89d688a64327a801e69e7 Mon Sep 17 00:00:00 2001
From: Quinn <quinnthepigeon@proton.me>
Date: Sun, 8 Jun 2025 01:03:14 +0200
Subject: [PATCH] improve vcpkg generation / caching

---
 .github/workflows/ci.yaml | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 908e95b..2cb5b0f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -9,30 +9,29 @@ on:
 env:
   VCPKG_DISABLE_METRICS: 1
   VCPKG_ROOT: /opt/vcpkg
+  DEPS_VCPKG: glfw3:x64-linux-dynamic glfw3:x64-mingw-static
 jobs:
   setup-vcpkg:
     runs-on: ubuntu-latest
     container: ghcr.io/thepigeongenerator/mcaselector-lite:latest
+    outputs:
+      CACHE_KEY_VCPKG: ${{steps.gen-keys.outputs.HASH_VCPKG}}
     steps:
+      - id: gen-keys
+        run: echo "HASH_VCPKG=vcpkg-$(echo "$DEPS_VCPKG" | sha256sum | cut -d ' ' -f1)" >>"$GITHUB_OUTPUT"
+      # load the vcpkg cache
       - uses: actions/cache@v4
         id: vcpkg-cache
         with:
           path: ${{env.VCPKG_ROOT}}
-          key: vcpkg-${{runner.os}}
-          restore-keys: vcpkg-${{runner.os}}
+          key: ${{steps.gen-keys.outputs.HASH_VCPKG}}
+          restore-keys: vcpkg-
+      # setup vcpkg if the cache didn't hit
       - if: steps.vcpkg-cache.outputs.cache-hit != 'true'
         run: |
           git clone https://github.com/microsoft/vcpkg.git "$VCPKG_ROOT"
-          $VCPKG_ROOT/bootstrap-vcpkg.sh
-      - if: steps.vcpkg-cache.outputs.cache-hit == 'true'
-        run: |
-          cd "$VCPKG_ROOT"
-          git fetch
-          git checkout master
-          git reset --hard origin/master
-          ./bootstrap-vcpkg.sh
-      - name: install vcpkg packages
-        run: $VCPKG_ROOT/vcpkg install glfw3:x64-linux-dynamic glfw3:x64-mingw-static;
+          "$VCPKG_ROOT/bootstrap-vcpkg.sh"
+          "$VCPKG_ROOT/vcpkg" install $DEPS_VCPKG
   compile:
     needs: setup-vcpkg
     runs-on: ubuntu-latest
@@ -47,10 +46,14 @@ jobs:
             march: x86_64
             cc: x86_64-w64-mingw32-gcc
     steps:
+      # load the vcpkg cache
       - uses: actions/cache@v4
+        id: cache-vcpkg
         with:
           path: ${{env.VCPKG_ROOT}}
-          key: vcpkg-${{runner.os}}
+          key: ${{needs.setup-vcpkg.outputs.CACHE_KEY_VCPKG}}
+      - if: steps.cache-vcpkg.outputs.cache-hit != 'true'
+        run: echo -e "\033[31mcache failed to load!\033[0m" >&2; exit 1
       - uses: actions/checkout@v4
       # compile
       - name: compile ${{matrix.march}}-${{matrix.kernel}}
@@ -67,10 +70,15 @@ jobs:
             cc: x86_64-linux-gnu-gcc
             # WARN: not testing win-x86_64... Probably a good idea to do that
     steps:
+      # load the vcpkg cache
       - uses: actions/cache@v4
+        id: cache-vcpkg
         with:
           path: ${{env.VCPKG_ROOT}}
-          key: vcpkg-${{runner.os}}
+          key: ${{needs.setup-vcpkg.outputs.CACHE_KEY_VCPKG}}
+      - if: steps.cache-vcpkg.outputs.cache-hit != 'true'
+        run: echo -e "\033[31mcache failed to load!\033[0m" >&2; exit 1
+      # compile and execute tests
       - uses: actions/checkout@v4
       - name: execute tests for ${{matrix.march}}-${{matrix.kernel}}
         run: make DEBUG=test run MARCH=${{matrix.march}} KERNEL=${{matrix.kernel}} CC=${{matrix.cc}} -j