[0.19] Backports #19025
Merged
[0.19] Backports #19025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Github-Pull: bitcoin#18425 Rebased-From: 3e0df92
Github-Pull: bitcoin#18676 Rebased-From: b68e717
They have been missing since buried deployments were merged Github-Pull: bitcoin#17946 Rebased-From: 2abe8cc
… appropriate Github-Pull: bitcoin#17946 Rebased-From : 412d5fe
|
Do you want to include #18542 here? |
Github-Pull: bitcoin#18160 Rebased-From: 0933a37
|
#19300 was merged. |
This is needed to compile with Qt 5.15. Github-Pull: bitcoin#19097 Rebased-From: 79b0a69
This has been removed from the master branch, and always seems to fail at the installing packages phase. i.e: ```bash pkg install -y autoconf automake boost-libs git gmake libevent libtool pkgconf python3 ccache Updating FreeBSD repository catalogue... Fetching meta.txz: . done pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2 repository FreeBSD has no meta file, using default settings Fetching packagesite.txz: .......... done pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2 pkg: Repository FreeBSD load error: meta cannot be loaded No error: 0 Unable to open created repository FreeBSD Unable to update repository FreeBSD Error updating repositories! Exit status: 3 ``` Github-Pull: bitcoin#19224 Rebased-From: e7f06f9
This is causing the tests to fail for backports etc. Github-Pull: bitcoin#19612 Rebased-From: 7ee4769
…CI configuration. Github-Pull: bitcoin#19444 Rebased-From: 961e667
Github-Pull: bitcoin#18640 Rebased-From: fac0c8d
Github-Pull: bitcoin#18001 Rebased-From: 2bcc705
|
ACK be95147 I ran range-diff for each of the individual commits to verify that they were unchanged, and did a quick scan over each commit. The only ones that were slightly unclean cherry picks were the appveyor commits. |
|
cherry-pick ACK be95147 🌎 Show signature and timestampSignature: Timestamp of file with hash |
maflcko
reviewed
Aug 11, 2020
| cd c:\tools\vcpkg | ||
| $env:GIT_REDIRECT_STDERR = '2>&1' # git is writing non-errors to STDERR when doing git pull. Send to STDOUT instead. | ||
| git pull origin master > $null | ||
| git checkout $env:VCPKG_COMMIT_ID |
There was a problem hiding this comment.
Any reason to check out the same commit twice?
You can avoid the conflicts by cherry-picking in the correct order:
$ git log -3 --oneline
a51ffbe92c (HEAD) Remove cached directories and associated script blocks from appveyor CI configuration.
6646b5f891 appveyor: Remove clcache
bd95892b0d Updated appveyor job to checkout a specific vcpkg commit ID.
This wasn't included here, but I went ahead and merged this to make the ci green on the other backport pulls |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backports the following to the 0.19 branch:
Closes: #19510.