[Backport] #19839 and #19842 to v0.20 #20008

pull jnewbery wants to merge 2 commits into bitcoin:0.20 from jnewbery:2020-09-appveyor-backport changing 1 files +1 −1

jnewbery commented at 8:41 AM on September 24, 2020: member

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.

Set appveyor vm version to previous Visual Studio 2019 release.

Latest vm version has updated cmake and the berkeleydb vcpkg now fails to build.

ad99777b57

Update the vcpkg checkout commit ID in appveyor config. 498b7cb6f3
fanquake added the label Backport on Sep 24, 2020
laanwj commented at 11:59 AM on September 24, 2020: member

ACK 498b7cb6f3f11d96129a4934cf1dbdc48c099f3a (Appveyor passes in the 0.20 branch again with this, where it fails on other PRs so it's clear that it works)
laanwj added the label Tests on Sep 24, 2020
laanwj merged this on Sep 24, 2020
laanwj closed this on Sep 24, 2020
jnewbery deleted the branch on Sep 24, 2020
DrahtBot locked this on Feb 15, 2022

Contributors

Labels