Skip to content

[28.x] More backports #32735

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 3 commits into from
Jun 17, 2025
Merged

[28.x] More backports #32735

merged 3 commits into from
Jun 17, 2025

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Jun 12, 2025 •
edited
Loading

@fanquake fanquake added this to the 28.2 milestone Jun 12, 2025
@DrahtBot
Copy link
Contributor

DrahtBot commented Jun 12, 2025 •
edited
Loading

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

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32735.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK willcl-ark

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

LLM Linter (✨ experimental)

Possible typos and grammar issues:

  • C_VISBILITY_PRESET -> C_VISIBILITY_PRESET [correct spelling of “visibility” in the CMake property name]
  • accomodate -> accommodate [correct spelling of “accommodate”]

drahtbot_id_4_m

@fanquake fanquake mentioned this pull request Jun 12, 2025
Merged
@DrahtBot
Copy link
Contributor

🚧 At least one of the CI tasks failed.
Task Win64, unit tests, no gui tests, no functional tests: https://github.com/bitcoin/bitcoin/runs/43959393827
LLM reason (✨ experimental): The failure is caused by errors in the test suite due to issues with Wine compatibility and missing system DLLs.

Hints

Try to run the tests locally, according to the documentation. However, a CI failure may still
happen due to a number of reasons, for example:

  • Possibly due to a silent merge conflict (the changes in this pull request being
    incompatible with the current code in the target branch). If so, make sure to rebase on the latest
    commit of the target branch.

  • A sanitizer issue, which can only be found by compiling with the sanitizer and running the
    affected test.

  • An intermittent issue.

Leave a comment here, if you need help tracking down a confusing failure.

achow101 and others added 3 commits June 13, 2025 12:32
@achow101 @fanquake
contrib: Sign all Windows binaries too
9082498 
Github-Pull: bitcoin#31407
Rebased-From: 3656b82
@josibake @fanquake
build: patch cmake min version on freetype
a6aca67 
Patch cmake_minimum_required version for freetype, using the version from
https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/352/diffs

This fixes a failure when building with CMake 4, where compatibility
with CMake versions < 3.5 has been removed (see https://cmake.org/cmake/help/latest/release/4.0.html#deprecated-and-removed-features)

Github-Pull: bitcoin#32693
Rebased-From: d7c3790
@fanquake
doc: update 28.x release notes
2437d93
@fanquake fanquake force-pushed the 28_x_win_sign_cmake_4 branch from 0fa8b92 to 2437d93 Compare June 13, 2025 11:33
@fanquake fanquake mentioned this pull request Jun 13, 2025
Merged
@fanquake fanquake marked this pull request as ready for review June 16, 2025 09:00
willcl-ark
willcl-ark approved these changes Jun 17, 2025
View reviewed changes
Copy link
Member

@willcl-ark willcl-ark left a comment

Choose a reason for hiding this comment

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

ACK 2437d93

Commit 9082498 "contrib: Sign all Windows binaries too" was missed from a previous backport, and 32693 is backported correctly.

@fanquake fanquake merged commit e5a9e24 into bitcoin:28.x Jun 17, 2025
15 of 16 checks passed
@fanquake fanquake deleted the 28_x_win_sign_cmake_4 branch June 17, 2025 12:11
stickies-v
stickies-v reviewed Jun 17, 2025
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.

Post-merge ACK 2437d93

All backport commits are clean, and make sense.

josibake
josibake reviewed Jun 17, 2025
View reviewed changes
Copy link
Member

@josibake josibake left a comment

Choose a reason for hiding this comment

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

Post merge ACK 2437d93

Briefly sanity checked 3656b82 and then verified that everything with #32693 is good.

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

@josibake josibake josibake left review comments

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

@willcl-ark willcl-ark willcl-ark approved these changes

Assignees
No one assigned
Labels
Backport CI failed
Projects
None yet
Milestone
28.2
Development

Successfully merging this pull request may close these issues.
6 participants
@fanquake @DrahtBot @willcl-ark @josibake @stickies-v @achow101