diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-09-24 14:06:43 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-09-24 14:07:47 +0200 |
| commit | 80aa83aa406447d9b0932301b37966a30d0e1b6e (patch) | |
| tree | cdb42a1d2746c66dd3d777d22f000516b37d0cd3 | |
| parent | 30926997fa157133b403b73d000a75ab06802f41 (diff) | |
| parent | 498b7cb6f3f11d96129a4934cf1dbdc48c099f3a (diff) | |
| download | bitcoin-80aa83aa406447d9b0932301b37966a30d0e1b6e.tar.xz | |
Merge #20008: [Backport] #19839 and #19842 to v0.20
498b7cb6f3f11d96129a4934cf1dbdc48c099f3a Update the vcpkg checkout commit ID in appveyor config. (Aaron Clauson)
ad99777b57f76a089fb87e3376e37081d560ce2e Set appveyor vm version to previous Visual Studio 2019 release. (Aaron Clauson)
Pull request description:
Required for appveyor builds to succeed for other v0.20 backports. For example #19606 fails to build on appveyor without these commits, and succeeds with them.
The first commit is actually reversed by the second commit (which also changes `VCPKG_COMMIT_ID`), but I'm backporting them both so that they're clean cherrypicks.
ACKs for top commit:
laanwj:
ACK 498b7cb6f3f11d96129a4934cf1dbdc48c099f3a
Tree-SHA512: 723a834fd86c8b5f58e71b9f1abfa8b3ad67376fab8e7d3699330142a6fde98547209b2b5fa6fdf9b934a447b29bf866e2258d0c303cec1062401e924e83f297
| -rw-r--r-- | .appveyor.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 56c92e6681..3718454f01 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -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 |