Skip to content

Commit b4f832e

Browse files
author
MarcoFalke
committed
Merge #18001: Updated appveyor job to checkout a specific vcpkg commit ID
2bcc705 Updated appveyor job to checkout a specific vcpkg commit ID. (Aaron Clauson) Pull request description: This PR sets the vcpkg packages in stone by checking out a specific commit ID whenever they need to be reinstalled. The commit ID was chosen as the most recent commit at the time of this PR. As per discussion on #17995 (and prior PR's/issues). ACKs for top commit: fanquake: ACK 2bcc705 - thanks for trying/suggesting all the different approaches, however this looks like the way to go. Should prevent `vcpkg` packages from changing out from under us. Tree-SHA512: ced9c9c6df2287214a966d10110edda43a06380bae270a0d9ba1fd3dde48c27c109881423978e173b3e02512f6380600096b30510e90d37a6967fd8bf9186cb6
2 parents c26b05c + 2bcc705 commit b4f832e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.appveyor.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ environment:
1313
QT_DOWNLOAD_HASH: '9a8c6eb20967873785057fdcd329a657c7f922b0af08c5fde105cc597dd37e21'
1414
QT_LOCAL_PATH: 'C:\Qt5.9.8_x64_static_vs2019'
1515
VCPKG_INSTALL_PATH: 'C:\tools\vcpkg\installed'
16+
VCPKG_COMMIT_ID: 'ed0df8ecc4ed7e755ea03e18aaf285fd9b4b4a74'
1617
cache:
1718
- C:\tools\vcpkg\installed -> build_msvc\vcpkg-packages.txt
1819
- C:\Users\appveyor\clcache -> .appveyor.yml, build_msvc\**, **\Makefile.am, **\*.vcxproj.in
@@ -25,7 +26,7 @@ install:
2526
# 1. Check whether the vcpkg install directory exists (note that updating the vcpkg-packages.txt file
2627
# will cause the appveyor cache rules to invalidate the directory)
2728
# 2. If the directory is missing:
28-
# a. Update the vcpkg source (including port files) and build the vcpkg binary,
29+
# a. Checkout the vcpkg source (including port files) for the specific checkout and build the vcpkg binary,
2930
# b. Install the missing packages.
3031
- ps: |
3132
$env:PACKAGES = Get-Content -Path build_msvc\vcpkg-packages.txt
@@ -34,6 +35,7 @@ install:
3435
cd c:\tools\vcpkg
3536
$env:GIT_REDIRECT_STDERR = '2>&1' # git is writing non-errors to STDERR when doing git pull. Send to STDOUT instead.
3637
git pull origin master
38+
git checkout $env:VCPKG_COMMIT_ID
3739
.\bootstrap-vcpkg.bat
3840
Add-Content "C:\tools\vcpkg\triplets\$env:PLATFORM-windows-static.cmake" "set(VCPKG_BUILD_TYPE release)"
3941
.\vcpkg install --triplet $env:PLATFORM-windows-static $env:PACKAGES.split() > $null

0 commit comments

Comments
 (0)