Skip to content

Conversation

sipsorcery
Copy link
Contributor

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 to the berkeleydb build config which allows it to be built on the latest appveyor vm.

@hebasto
Copy link
Member

hebasto commented Aug 31, 2020

Concept ACK.
Many thanks to @sipsorcery !

@maflcko
Copy link
Member

maflcko commented Aug 31, 2020

Concept ACK

@maflcko maflcko closed this Aug 31, 2020
@maflcko maflcko reopened this Aug 31, 2020
@maflcko
Copy link
Member

maflcko commented Aug 31, 2020

Concept ACK a104cae

Only checked that appveyor is green

@maflcko maflcko merged commit 068bc21 into bitcoin:master Aug 31, 2020
laanwj added a commit that referenced this pull request Sep 24, 2020
498b7cb Update the vcpkg checkout commit ID in appveyor config. (Aaron Clauson)
ad99777 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 498b7cb

Tree-SHA512: 723a834fd86c8b5f58e71b9f1abfa8b3ad67376fab8e7d3699330142a6fde98547209b2b5fa6fdf9b934a447b29bf866e2258d0c303cec1062401e924e83f297
@fanquake
Copy link
Member

This was backported to 0.20 in #20008.

fanquake pushed a commit to fanquake/bitcoin that referenced this pull request Oct 14, 2020
@fanquake fanquake mentioned this pull request Oct 15, 2020
@fanquake
Copy link
Member

This or #20095 will be backported to 0.19 in #20150.

@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants