Skip to content

Commit 068bc21

Browse files
author
MarcoFalke
committed
Merge #19842: Update the vcpkg checkout commit ID in appveyor config
a104cae Update the vcpkg checkout commit ID in appveyor config. (Aaron Clauson) Pull request description: A recent appveyor vm update broke the build of the `berkeleydb` vcpkg dependency, see #19839. The temporary resolution was to switch back to the previous appveyor vm. This PR updates the pegged vcpkg commit ID to the most recent commit as of 31 Aug 2020. That commit ID has been tested against the latest appveyor vm and is able to build Bitcoin Core successfully. The vcpkg bump includes a [patch](microsoft/vcpkg#12870) to the `berkeleydb` build config which allows it to be built on the latest appveyor vm. ACKs for top commit: MarcoFalke: Concept ACK a104cae Tree-SHA512: 6d363d1615c51bb3d4b324eb96d53950648fc97fc81ffaef91ee6e92f1336776d150d89f6e859f354ee75ce66afcef07aa19ed39b725dbb3f47ba67d26e111db
2 parents c1e0c2a + a104cae commit 068bc21

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: '{branch}.{build}'
22
skip_tags: true
3-
image: Previous Visual Studio 2019
3+
image: Visual Studio 2019
44
configuration: Release
55
platform: x64
66
clone_depth: 5
@@ -11,7 +11,7 @@ environment:
1111
QT_DOWNLOAD_HASH: '9a8c6eb20967873785057fdcd329a657c7f922b0af08c5fde105cc597dd37e21'
1212
QT_LOCAL_PATH: 'C:\Qt5.9.8_x64_static_vs2019'
1313
VCPKG_INSTALL_PATH: 'C:\tools\vcpkg\installed'
14-
VCPKG_COMMIT_ID: 'ed0df8ecc4ed7e755ea03e18aaf285fd9b4b4a74'
14+
VCPKG_COMMIT_ID: 'f3f329a048eaff759c1992c458f2e12351486bc7'
1515
install:
1616
# Disable zmq test for now since python zmq library on Windows would cause Access violation sometimes.
1717
# - cmd: pip install zmq

0 commit comments

Comments
 (0)