From ffa16ff5498fb70027215d47cc9a3b9c19552eb3 Mon Sep 17 00:00:00 2001
From: "F.D.Castel" <fdcastel@gmail.com>
Date: Tue, 10 Mar 2026 16:52:44 -0300
Subject: [PATCH] Fix vcpkg cache paths for Linux and macOS

- Fix Linux/macOS cache path from build/Release/vcpkg_installed to
  build/vcpkg_installed to match VCPKG_INSTALLED_DIR in CMakePresets.json
- Add missing vcpkg cache steps to pull-request.yml for all platforms
- Bump cache key version to v3 to invalidate stale entries
---
 .github/workflows/main.yml         | 16 ++++++-------
 .github/workflows/pull-request.yml | 36 ++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 24b05c7..472ddf5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -53,10 +53,10 @@ jobs:
             vcpkg/downloads
             vcpkg/buildtrees
             vcpkg/packages
-            build/Release/vcpkg_installed
-          key: ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json', 'vcpkg-configuration.json') }}
+            build/vcpkg_installed
+          key: ${{ runner.os }}-vcpkg-v3-${{ hashFiles('vcpkg.json', 'vcpkg-configuration.json') }}
           restore-keys: |
-            ${{ runner.os }}-vcpkg-
+            ${{ runner.os }}-vcpkg-v3-
 
       - name: Install system dependencies
         run: |
@@ -158,9 +158,9 @@ jobs:
             vcpkg/buildtrees
             vcpkg/packages
             build/vcpkg_installed
-          key: ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json', 'vcpkg-configuration.json') }}
+          key: ${{ runner.os }}-vcpkg-v3-${{ hashFiles('vcpkg.json', 'vcpkg-configuration.json') }}
           restore-keys: |
-            ${{ runner.os }}-vcpkg-
+            ${{ runner.os }}-vcpkg-v3-
 
       - name: Install Firebird
         shell: cmd
@@ -247,10 +247,10 @@ jobs:
             vcpkg/downloads
             vcpkg/buildtrees
             vcpkg/packages
-            build/Release/vcpkg_installed
-          key: ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json', 'vcpkg-configuration.json') }}
+            build/vcpkg_installed
+          key: ${{ runner.os }}-vcpkg-v3-${{ hashFiles('vcpkg.json', 'vcpkg-configuration.json') }}
           restore-keys: |
-            ${{ runner.os }}-vcpkg-
+            ${{ runner.os }}-vcpkg-v3-
 
       - name: Install system dependencies
         run: |
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index e13c802..cfbf273 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -42,6 +42,18 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
+      - name: Cache vcpkg artifacts
+        uses: actions/cache@v4
+        with:
+          path: |
+            vcpkg/downloads
+            vcpkg/buildtrees
+            vcpkg/packages
+            build/vcpkg_installed
+          key: ${{ runner.os }}-vcpkg-v3-${{ hashFiles('vcpkg.json', 'vcpkg-configuration.json') }}
+          restore-keys: |
+            ${{ runner.os }}-vcpkg-v3-
+
       - name: Install system dependencies
         run: |
           sudo apt-get update
@@ -129,6 +141,18 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
+      - name: Cache vcpkg artifacts
+        uses: actions/cache@v4
+        with:
+          path: |
+            vcpkg/downloads
+            vcpkg/buildtrees
+            vcpkg/packages
+            build/vcpkg_installed
+          key: ${{ runner.os }}-vcpkg-v3-${{ hashFiles('vcpkg.json', 'vcpkg-configuration.json') }}
+          restore-keys: |
+            ${{ runner.os }}-vcpkg-v3-
+
       - name: Install Firebird
         shell: cmd
         run: |
@@ -209,6 +233,18 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
+      - name: Cache vcpkg artifacts
+        uses: actions/cache@v4
+        with:
+          path: |
+            vcpkg/downloads
+            vcpkg/buildtrees
+            vcpkg/packages
+            build/vcpkg_installed
+          key: ${{ runner.os }}-vcpkg-v3-${{ hashFiles('vcpkg.json', 'vcpkg-configuration.json') }}
+          restore-keys: |
+            ${{ runner.os }}-vcpkg-v3-
+
       - name: Install system dependencies
         run: |
           brew install \