ci: fixed vcpkg binary assets cache updating

Author: SNMetamorph

.github/workflows/codeql-analysis.yml

@@ -99,8 +99,8 @@ jobs:
           !${{ env.VCPKG_ROOT }}/downloads
           !${{ env.VCPKG_ROOT }}/installed
         # The key is composed in a way that it gets properly invalidated whenever a different version of vcpkg is being used.
-        key: |
-          vcpkg-${{ hashFiles('.git/modules/external/vcpkg/HEAD') }}-${{ runner.os }}
+        key: vcpkg-${{ hashFiles('.git/modules/external/vcpkg/HEAD') }}-${{ runner.os }}-${{ github.run_id }}
+        restore-keys: vcpkg-${{ hashFiles('.git/modules/external/vcpkg/HEAD') }}-${{ runner.os }}
 
     - name: Configure CMake
       working-directory: ${{ github.workspace }}/build

.github/workflows/nightly-builds.yml

@@ -61,6 +61,9 @@ jobs:
             core.exportVariable('VCPKG_ROOT', `${process.env.GITHUB_WORKSPACE}/external/vcpkg`.replaceAll('\\', '/'));
             core.exportVariable('VCPKG_DEFAULT_BINARY_CACHE', `${process.env.GITHUB_WORKSPACE}/external/vcpkg/bincache`.replaceAll('\\', '/'));
 
+      - name: Obtain current job information
+        uses: qoomon/actions--context@v4
+
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
         run: |
@@ -90,8 +93,8 @@ jobs:
             !${{ env.VCPKG_ROOT }}/downloads
             !${{ env.VCPKG_ROOT }}/installed
           # The key is composed in a way that it gets properly invalidated whenever a different version of vcpkg is being used.
-          key: |
-            vcpkg-${{ hashFiles('.git/modules/external/vcpkg/HEAD') }}-${{ runner.os }}
+          key: vcpkg-${{ hashFiles('.git/modules/external/vcpkg/HEAD') }}-${{ runner.os }}-${{ env.GITHUB_JOB_ID }}
+          restore-keys: vcpkg-${{ hashFiles('.git/modules/external/vcpkg/HEAD') }}-${{ runner.os }}
 
       - name: Configure CMake
         working-directory: ${{ github.workspace }}/build