diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-08-31 17:02:14 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-08-31 17:02:20 +0200 |
| commit | 068bc211881c790225e9979eb16ce4f44fb64e01 (patch) | |
| tree | dcc0e74958b6908e6d34df1addc1a00724439f04 | |
| parent | c1e0c2ad3b6cd9e7ef55287fb572cfcf10a0e660 (diff) | |
| parent | a104caeb4008a6e0726ba604ece6f53549110354 (diff) | |
Merge #19842: Update the vcpkg checkout commit ID in appveyor config
a104caeb4008a6e0726ba604ece6f53549110354 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](https://github.com/microsoft/vcpkg/pull/12870) to the `berkeleydb` build config which allows it to be built on the latest appveyor vm.
ACKs for top commit:
MarcoFalke:
Concept ACK a104caeb4008a6e0726ba604ece6f53549110354
Tree-SHA512: 6d363d1615c51bb3d4b324eb96d53950648fc97fc81ffaef91ee6e92f1336776d150d89f6e859f354ee75ce66afcef07aa19ed39b725dbb3f47ba67d26e111db
| -rw-r--r-- | .appveyor.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 540d06b0c8..6722c1fbec 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,6 @@ version: '{branch}.{build}' skip_tags: true -image: Previous Visual Studio 2019 +image: Visual Studio 2019 configuration: Release platform: x64 clone_depth: 5 @@ -11,7 +11,7 @@ environment: QT_DOWNLOAD_HASH: '9a8c6eb20967873785057fdcd329a657c7f922b0af08c5fde105cc597dd37e21' QT_LOCAL_PATH: 'C:\Qt5.9.8_x64_static_vs2019' VCPKG_INSTALL_PATH: 'C:\tools\vcpkg\installed' - VCPKG_COMMIT_ID: 'ed0df8ecc4ed7e755ea03e18aaf285fd9b4b4a74' + VCPKG_COMMIT_ID: 'f3f329a048eaff759c1992c458f2e12351486bc7' install: # Disable zmq test for now since python zmq library on Windows would cause Access violation sometimes. # - cmd: pip install zmq |