@@ -197,6 +197,8 @@ jobs:
197
197
run : |
198
198
msbuild -version | Out-File -FilePath "$env:GITHUB_WORKSPACE\msbuild_version"
199
199
Get-Content -Path "$env:GITHUB_WORKSPACE\msbuild_version"
200
+ $env:VCToolsVersion | Out-File -FilePath "$env:GITHUB_WORKSPACE\toolset_version"
201
+ Get-Content -Path "$env:GITHUB_WORKSPACE\toolset_version"
200
202
$env:CI_QT_URL | Out-File -FilePath "$env:GITHUB_WORKSPACE\qt_url"
201
203
$env:CI_QT_CONF | Out-File -FilePath "$env:GITHUB_WORKSPACE\qt_conf"
202
204
@@ -279,6 +281,7 @@ jobs:
279
281
run : |
280
282
Set-Location "$env:VCPKG_INSTALLATION_ROOT"
281
283
Add-Content -Path "triplets\x64-windows-static.cmake" -Value "set(VCPKG_BUILD_TYPE release)"
284
+ Add-Content -Path "triplets\x64-windows-static.cmake" -Value "set(VCPKG_PLATFORM_TOOLSET_VERSION $env:VCToolsVersion)"
282
285
.\vcpkg.exe --vcpkg-root "$env:VCPKG_INSTALLATION_ROOT" integrate install
283
286
git rev-parse HEAD | Out-File -FilePath "$env:GITHUB_WORKSPACE\vcpkg_commit"
284
287
Get-Content -Path "$env:GITHUB_WORKSPACE\vcpkg_commit"
@@ -293,7 +296,7 @@ jobs:
293
296
uses : actions/cache@v3
294
297
with :
295
298
path : ~/AppData/Local/vcpkg/archives
296
- key : ${{ github.job }}-vcpkg-binary-${{ hashFiles('vcpkg_commit', 'msbuild_version', 'build_msvc/vcpkg.json') }}
299
+ key : ${{ github.job }}-vcpkg-binary-${{ hashFiles('vcpkg_commit', 'msbuild_version', 'toolset_version', ' build_msvc/vcpkg.json') }}
297
300
298
301
- name : Generate project files
299
302
run : py -3 build_msvc\msvc-autogen.py
0 commit comments