Skip to content

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Dec 16, 2020

The remaining backports to get rc4 out. Currently only waiting on the macOS build fix.

@Sjors
Copy link
Member

Sjors commented Dec 16, 2020

ACK up to 8273ea3

…ge introduced in bitcoin#19960. It re-applies a setting to inform vcpkg to only build release vesions of the dependencies rather than the default of debug and release.

It had been expected that the vcpkg manifest mechanism introduced in bitcoin#19960 would do this automatically but it turns out not to be the case.

Github-Pull: bitcoin#20489
Rebased-From: fa18e7c
…at are causing sporadic ABI issues on Visual Studio updates.

Tidied up debug and release configuration blocks in common project file to avoid duplication.

Updated appveyor config to use latest Visual Studio 2019 image.

Changed appveyor config file hash to use a new version of Qt pre-compiled binaries built for Visual Studio 2019 v16.8.1.

Bumped vcpkg version to tag '2020.11-1' for binary caching feature.

See bitcoin#20392 for related discussion.

Github-Pull: bitcoin#20506
Rebased-From: 8b99e60
@jonatack
Copy link
Member

Consider adding #19961 if merged in time.

benthecarman and others added 2 commits December 21, 2020 20:01
This field was already being returned, but the RPCHelpMan did not indicate
this. So, this PR updates the help text to match.

Github-Pull: bitcoin#20756
Rebased-From: 667d203
@maflcko
Copy link
Member Author

maflcko commented Dec 28, 2020

The commits are all mostly documentation or test related clean cherry-picks IIRC, so shouldn't be too hard to review

@benthecarman
Copy link
Contributor

ACK b1c0f97

@Sjors
Copy link
Member

Sjors commented Dec 30, 2020

ACK b1c0f97

@laanwj laanwj merged commit ac125e9 into bitcoin:0.21 Jan 2, 2021
@maflcko maflcko deleted the 2012-rc4 branch January 2, 2021 14:06
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.