9595 id : cache-restore
9696 with :
9797 path : ${{ runner.temp }}/vcpkg-cache
98- key : vcpkg-cache-${{ matrix.msvc }}-${{ matrix.arch }}-${{ hashFiles('vcpkg.json', 'ci/etc/vcpkg-version.txt') }}
98+ key : vcpkg-cache-${{ matrix.msvc }}-${{ matrix.arch }}-${{ hashFiles('vcpkg.json', 'ci/etc/vcpkg-version.txt', 'vcpkg-configuration.json', 'ci/etc/triplets/**' ) }}
9999 restore-keys : |
100100 vcpkg-cache-${{ matrix.msvc }}-${{ matrix.arch }}-
101101 # go/github-actions#gha-bestpractices explains why we use a SHA instead of
@@ -114,7 +114,7 @@ jobs:
114114 CLOUDSDK_PYTHON : ${{ steps.py311.outputs.python-path }}
115115 BRANCH_NAME : ${{ github.ref_name }}
116116 run : |
117- export VCPKG_ROOT="${TEMP}/.build/vcpkg"
117+ export VCPKG_ROOT=$(cygpath -w "${TEMP}/.build/vcpkg")
118118 export CMAKE_OUT="c:/b"
119119
120120 export MSVC_VERSION="${{ matrix.msvc }}"
@@ -132,7 +132,7 @@ jobs:
132132 if : always() && steps.cache-restore.outputs.cache-hit != 'true'
133133 with :
134134 path : ${{ runner.temp }}/vcpkg-cache
135- key : vcpkg-cache-${{ matrix.msvc }}-${{ matrix.arch }}-${{ hashFiles('vcpkg.json', 'ci/etc/vcpkg-version.txt') }}
135+ key : vcpkg-cache-${{ matrix.msvc }}-${{ matrix.arch }}-${{ hashFiles('vcpkg.json', 'ci/etc/vcpkg-version.txt', 'vcpkg-configuration.json', 'ci/etc/triplets/**' ) }}
136136
137137 - name : Build and Upload Windows Installer
138138 if : env.BUILD_SHARD == 'BqDriver'
@@ -170,7 +170,7 @@ jobs:
170170 CLOUDSDK_PYTHON : ${{ steps.py311.outputs.python-path }}
171171 BRANCH_NAME : ${{ github.ref_name }}
172172 run : |
173- export VCPKG_ROOT="${TEMP}/.build/vcpkg"
173+ export VCPKG_ROOT=$(cygpath -w "${TEMP}/.build/vcpkg")
174174 # Put the CMake output in a directory with more space and keep it short
175175 # to avoid running into the MSVC limits.
176176 export CMAKE_OUT='c:\b'
0 commit comments