Skip to content

[28.x] backports and finalize #30959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 5 commits into from
Oct 1, 2024
Merged

[28.x] backports and finalize #30959

merged 5 commits into from
Oct 1, 2024

Conversation

achow101
Copy link
Member

@achow101 achow101 commented Sep 24, 2024 •
edited
Loading

@DrahtBot
Copy link
Contributor

DrahtBot commented Sep 24, 2024 •
edited
Loading

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK sipa
Stale ACK hebasto

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@achow101 achow101 mentioned this pull request Sep 24, 2024
Merged
@achow101 achow101 added this to the 28.0 milestone Sep 24, 2024
@achow101 achow101 changed the title [28.x] Further backports [28.x] backports and finalize (or rc3) Sep 24, 2024
hebasto
hebasto approved these changes Sep 25, 2024
View reviewed changes
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 1f6c3ca.

A new backport only affects the test code, so I agree to skip the rc3 phase.

mzumsande and others added 3 commits September 25, 2024 14:34
@mzumsande @achow101
validation: Disable CheckForkWarningConditions for background chainstate
7fcd7b8 
The comparison of m_best_invalid with the tip of the respective chainstate
makes no sense for the background chainstate, and can lead to incorrect
error messages.

Github-Pull: bitcoin#30962
Rebased-From: c0a0c72
@achow101
build: Bump to 28.0
5feef9c
@achow101
doc: generate manpages
98745e0
@achow101
Copy link
Member Author

Added #30962

I think it's trivial enough to not require rc3 as well.

@achow101 achow101 mentioned this pull request Sep 25, 2024
Merged
stickies-v
stickies-v reviewed Sep 27, 2024
View reviewed changes
Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code LGTM 98745e0

Verified all backport commits are clean and make sense, and that I'm getting the same manpages. I think doc/release-notes.md still needs to be updated though?

@achow101
Copy link
Member Author

I think doc/release-notes.md still needs to be updated though?

I think that's usually done when after the release is published on the website.

@achow101 achow101 changed the title [28.x] backports and finalize (or rc3) [28.x] backports and finalize Sep 30, 2024
@stickies-v
Copy link
Contributor

It seems to have been the process for 26.0 and 27.0 at least:

@achow101
Copy link
Member Author

Hmm ok, will add those soon. Still some changes to be made on the release notes.

@achow101
Copy link
Member Author

achow101 commented Sep 30, 2024 •
edited
Loading

Added release notes (as of eab8c9df5996bfe0d0997f747eefbdb745381aa0)

@instagibbs
Copy link
Member

LGTM 5de225f

@sipa
Copy link
Member

sipa commented Oct 1, 2024

utACK 5de225f

@DrahtBot DrahtBot requested a review from hebasto October 1, 2024 17:12
@achow101 achow101 merged commit 1101837 into bitcoin:28.x Oct 1, 2024
16 checks passed
@glozow
Copy link
Member

glozow commented Oct 1, 2024

post merge ACK

@stickies-v
Copy link
Contributor

stickies-v commented Oct 1, 2024 •
edited
Loading

Added release notes (as of eab8c9df5996bfe0d0997f747eefbdb745381aa0)

Thanks! I've added https://github.com/bitcoin-core/bitcoin-devwiki/wiki/28.0-Release-Notes-Draft/6677e1b3aa3ecadd142786f1393d2a7affe9e03e which adds missing PR numbers.

Release notes otherwise LGTM, I verified the author list and read through the descriptions. I think these 3 might benefit from being added to the list too, I'll give them a go later:

Edit: oh, too late. I'm on bad wifi today, didn't see it got merged already.

@stickies-v stickies-v mentioned this pull request Oct 2, 2024
Merged
Imebeez

This comment was marked as spam.

Sign in to view

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hebasto hebasto Awaiting requested review from hebasto

2 more reviewers

@Imebeez Imebeez Imebeez left review comments

@stickies-v stickies-v stickies-v left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
Backport
Projects
None yet
Milestone
28.0
Development

Successfully merging this pull request may close these issues.
9 participants
@achow101 @DrahtBot @stickies-v @instagibbs @sipa @glozow @hebasto @Imebeez @mzumsande