ci: cache installed vcpkg packages

Change caching to cache installed packages and run vcpkg upgrade to
match the previous behavior where packages were re-built each time.

Signed-off-by: Erik Cederberg <erik.cederberg@sectra.com>

Author: erikced

.github/workflows/call-build-windows.yaml

@@ -82,19 +82,16 @@ jobs:
         config:
           - name: "Windows 32bit"
             arch: x86
-            openssl_dir: C:\vcpkg\packages\openssl_x86-windows-static
             cmake_additional_opt: ""
             vcpkg_triplet: x86-windows-static
             cmake_version: "3.31.6"
           - name: "Windows 64bit"
             arch: x64
-            openssl_dir: C:\vcpkg\packages\openssl_x64-windows-static
             cmake_additional_opt: ""
             vcpkg_triplet: x64-windows-static
             cmake_version: "3.31.6"
           - name: "Windows 64bit (Arm64)"
             arch: amd64_arm64
-            openssl_dir: C:\vcpkg\packages\openssl_arm64-windows-static
             cmake_additional_opt: "-DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_SYSTEM_PROCESSOR=ARM64"
             vcpkg_triplet: arm64-windows-static
             cmake_version: "3.31.6"
@@ -143,10 +140,10 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: |
-            C:\vcpkg\packages
-          key: ${{ runner.os }}-${{ matrix.config.arch }}-vcpkg-${{ steps.get-date.outputs.date }}
+            C:\vcpkg\installed
+          key: ${{ runner.os }}-${{ matrix.config.arch }}-vcpkg-installed-${{ steps.get-date.outputs.date }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.config.arch }}-vcpkg-
+            ${{ runner.os }}-${{ matrix.config.arch }}-vcpkg-installed-
           enableCrossOsArchive: false
 
       - name: Build openssl with vcpkg
@@ -159,12 +156,17 @@ jobs:
           C:\vcpkg\vcpkg install --recurse libyaml --triplet ${{ matrix.config.vcpkg_triplet }}
         shell: cmd
 
+      - name: Upgrade any outdated vcpkg packages
+        run: |
+          C:\vcpkg\vcpkg upgrade --no-dry-run
+        shell: cmd
+
       - name: Save packages of vcpkg
         id: save-vcpkg-sources
         uses: actions/cache/save@v4
         with:
           path: |
-            C:\vcpkg\packages
+            C:\vcpkg\installed
           key: ${{ steps.cache-vcpkg-sources.outputs.cache-primary-key }}
           enableCrossOsArchive: false
 
@@ -174,7 +176,7 @@ jobs:
         # This is only supposed to be a workaround for now so can be easily removed later.
         if: ${{ matrix.config.arch != 'amd64_arm64' || needs.call-build-windows-get-meta.outputs.armSupported == 'true' }}
         run: |
-          cmake -G "Ninja" -DFLB_NIGHTLY_BUILD='${{ inputs.unstable }}' -DOPENSSL_ROOT_DIR='${{ matrix.config.openssl_dir }}' ${{ matrix.config.cmake_additional_opt }} -DFLB_LIBYAML_DIR=C:\vcpkg\packages\libyaml_${{ matrix.config.vcpkg_triplet }} ../
+          cmake -G "Ninja" -DFLB_NIGHTLY_BUILD='${{ inputs.unstable }}' -DOPENSSL_ROOT_DIR='C:\vcpkg\installed\${{ matrix.config.vcpkg_triplet }}' ${{ matrix.config.cmake_additional_opt }} -DFLB_LIBYAML_DIR='C:\vcpkg\installed\${{ matrix.config.vcpkg_triplet }}' ../
           cmake --build .
           cpack
         working-directory: build

.github/workflows/call-windows-unit-tests.yaml

@@ -36,13 +36,11 @@ jobs:
         config:
           - name: "Windows 32bit"
             arch: x86
-            openssl_dir: C:\vcpkg\packages\openssl_x86-windows-static
             cmake_additional_opt: ""
             vcpkg_triplet: x86-windows-static
             cmake_version: "3.31.6"
           - name: "Windows 64bit"
             arch: x64
-            openssl_dir: C:\vcpkg\packages\openssl_x64-windows-static
             cmake_additional_opt: ""
             vcpkg_triplet: x64-windows-static
             cmake_version: "3.31.6"
@@ -91,10 +89,10 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: |
-            C:\vcpkg\packages
-          key: ${{ runner.os }}-${{ matrix.config.arch }}-wintest-vcpkg-${{ steps.get-date.outputs.date }}
+            C:\vcpkg\installed
+          key: ${{ runner.os }}-${{ matrix.config.arch }}-wintest-vcpkg-installed-${{ steps.get-date.outputs.date }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.config.arch }}-wintest-vcpkg-
+            ${{ runner.os }}-${{ matrix.config.arch }}-wintest-vcpkg-installed-
           enableCrossOsArchive: false
 
       - name: Build openssl with vcpkg
@@ -107,12 +105,17 @@ jobs:
           C:\vcpkg\vcpkg install --recurse libyaml --triplet ${{ matrix.config.vcpkg_triplet }}
         shell: cmd
 
+      - name: Upgrade any outdated vcpkg packages
+        run: |
+          C:\vcpkg\vcpkg upgrade --no-dry-run
+        shell: cmd
+
       - name: Save packages of vcpkg
         id: save-vcpkg-sources
         uses: actions/cache/save@v4
         with:
           path: |
-            C:\vcpkg\packages
+            C:\vcpkg\installed
           key: ${{ steps.cache-unit-test-vcpkg-sources.outputs.cache-primary-key }}
           enableCrossOsArchive: false
 
@@ -121,9 +124,9 @@ jobs:
           cmake -G "Ninja" `
             -D FLB_TESTS_INTERNAL=On `
             -D FLB_NIGHTLY_BUILD='${{ inputs.unstable }}' `
-            -D OPENSSL_ROOT_DIR='${{ matrix.config.openssl_dir }}' `
+            -D OPENSSL_ROOT_DIR='C:\vcpkg\installed\${{ matrix.config.vcpkg_triplet }}' `
             ${{ matrix.config.cmake_additional_opt }} `
-            -D FLB_LIBYAML_DIR=C:\vcpkg\packages\libyaml_${{ matrix.config.vcpkg_triplet }} `
+            -D FLB_LIBYAML_DIR='C:\vcpkg\installed\${{ matrix.config.vcpkg_triplet }}' `
             -D FLB_WITHOUT_flb-rt-out_elasticsearch=On `
             -D FLB_WITHOUT_flb-rt-out_td=On `
             -D FLB_WITHOUT_flb-rt-out_forward=On `