Skip to content
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.

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

minisketch: update subtree to 3472e2f5ec75ace39ce9243af6b3fee233a67492 #29823

Merged
merged 3 commits into from Apr 15, 2024

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Apr 6, 2024

sipa/minisketch#81 will fix #29799.
Minor build cleanups after sipa/minisketch#80.

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 6, 2024

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 dergoegge, hebasto

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

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 6, 2024

🚧 At least one of the CI tasks failed. Make sure to run all tests locally, according to the
documentation.

Possibly this is 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.

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

Debug: https://github.com/bitcoin/bitcoin/runs/23521358444

@fanquake fanquake force-pushed the pull_minisketch_tree branch 2 times, most recently from 2161196 to c03fd4e Compare April 10, 2024 08:04
@dergoegge
Copy link
Member

Fuzzed for 2000 CPU hours, no more UB was found

Copy link
Member

@dergoegge dergoegge left a comment

Choose a reason for hiding this comment

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

ACK c03fd4e

@fanquake fanquake changed the title minisketch: pull subtree + #81 minisketch: pull subtree + #80 & #81 Apr 11, 2024
@fanquake fanquake force-pushed the pull_minisketch_tree branch 2 times, most recently from 396873b to d66eefc Compare April 11, 2024 14:11
@fanquake fanquake changed the title minisketch: pull subtree + #80 & #81 minisketch: pull subtree + #81 Apr 11, 2024
@sipa
Copy link
Member

sipa commented Apr 12, 2024

sipa/minisketch#81 is now merged upstream.

3472e2f5ec Merge sipa/minisketch#81: Avoid overflowing shift by special casing inverse of 1
653d8b2e26 Avoid overflowing shift by special casing inverse of 1
33b7c200b9 Merge sipa/minisketch#80: Add c++20 version of CountBits
4a48f31a37 Merge sipa/minisketch#83: ci: Fix "s390x (big-endian)" task
82b6488acb Add c++20 version of CountBits
0498084d31 ci: Fix "s390x (big-endian)" task
71709dca9e Merge sipa/minisketch#82: ci: Fix `x86_64-w64-mingw32` task
9e6127fa98 Merge sipa/minisketch#74: Avoid >> above type width in BitWriter
ed420bc170 ci: Fix `x86_64-w64-mingw32` task
fe1040f227 Drop -Wno-shift-count-overflow compile flag
154bcd43bd Avoid >> above type width in BitWriter
67b87acdb6 Merge sipa/minisketch#78: ci: Update macOS image for CI
7de7250416 ci: Update macOS image for CI
83d812ea9f Merge sipa/minisketch#73: ci: Use correct variable to designate C++ compiler
e051a7d690 ci: Install wine32 package for Windows tests
2d2c695d78 build: Drop unused `CC` variable
1810fcbd11 ci: Use correct variable to designate C++ compiler
022b959049 Merge sipa/minisketch#77: Add missing include
08443c4892 Add missing include

git-subtree-dir: src/minisketch
git-subtree-split: 3472e2f5ec75ace39ce9243af6b3fee233a67492
@fanquake fanquake changed the title minisketch: pull subtree + #81 minisketch: update subtree to 3472e2f5ec75ace39ce9243af6b3fee233a67492 Apr 12, 2024
@fanquake fanquake marked this pull request as ready for review April 12, 2024 12:31
@fanquake
Copy link
Member Author

sipa/minisketch#81 is now merged upstream.

This is now ready for review.

Copy link
Member

@dergoegge dergoegge left a comment

Choose a reason for hiding this comment

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

utACK 4722b7c

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 4722b7c, I have verified the subtree update and reviewed the build system changes. Both look OK.

@fanquake fanquake merged commit d29fc3a into bitcoin:master Apr 15, 2024
16 checks passed
@fanquake fanquake deleted the pull_minisketch_tree branch April 15, 2024 09:00
hebasto added a commit to hebasto/bitcoin that referenced this pull request Apr 18, 2024
hebasto added a commit to hebasto/bitcoin that referenced this pull request Apr 18, 2024
hebasto added a commit to hebasto/bitcoin that referenced this pull request Apr 18, 2024
fd71331 fixup! cmake: Build `minisketch` static library (Hennadii Stepanov)
49a902a fixup! cmake: Check system symbols (Hennadii Stepanov)

Pull request description:

  Backport changes from bitcoin#29823.

ACKs for top commit:
  theuni:
    utACK fd71331

Tree-SHA512: 5259b9c7aa1f4466846c2974aa2a73b5bc507da9c53ac574e6ee6ca1a0c16502e1cde87d0a4119f32b44a5b7fe672ba3919da3b949eff5f9beac736695e89a61
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants