[CI] Don't use cache fallback when presets are modified

Author: aliendroid1

.github/workflows/build-toolchain.yml

@@ -47,10 +47,12 @@ jobs:
         id: cache-cmake-deps
         uses: actions/cache@v4
         with:
-          path: build\${{ inputs.preset }}\_deps
-          key: cmake-deps-${{ inputs.preset }}-${{ hashFiles('cmake/**/*.cmake', '**/CMakeLists.txt') }}
-          restore-keys: |
-            cmake-deps-${{ inputs.preset }}-
+            key: cmake-deps-${{ inputs.preset }}-${{ hashFiles('CMakePresets.json','**/CMakeLists.txt','cmake/**/*.cmake') }}
+            restore-keys: |
+                # fallback if *only* CMakeLists or .cmake files changed, but presets didn't:
+                cmake-deps-${{ inputs.preset }}-${{ hashFiles('**/CMakeLists.txt','cmake/**/*.cmake') }}  
+                # last-resort fallback for any earlier version of this preset:
+                cmake-deps-${{ inputs.preset }}-
 
       - name: Download VC6 Portable from Cloudflare R2
         if: ${{ startsWith(inputs.preset, 'vc6') && steps.cache-vc6.outputs.cache-hit != 'true' }}

CMakePresets.json

@@ -9,13 +9,13 @@
         {
             "name": "vc6",
             "displayName": "Windows 32bit VC6 Release",
-            "generator": "NMake Makefiles",
+            "generator": "Ninja",
             "hidden": false,
             "binaryDir": "${sourceDir}/build/${presetName}",
             "cacheVariables": {
                 "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
                 "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
-                "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:ProgramDatabase>",
+                "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "",
                 "CMAKE_BUILD_TYPE": "Release",
                 "RTS_FLAGS": "/W3"
             },