https://github.com/sipa/minisketch/pull/81 will fix #29799. Minor build cleanups after https://github.com/sipa/minisketch/pull/80.
minisketch: update subtree to 3472e2f5ec75ace39ce9243af6b3fee233a67492 #29823
pull fanquake wants to merge 3 commits into bitcoin:master from fanquake:pull_minisketch_tree changing 7 files +64 −68-
fanquake commented at 5:48 PM on April 6, 2024: member
-
DrahtBot commented at 5:48 PM on April 6, 2024: contributor
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--006a51241073e994b41acfe9ec718e94-->
Code Coverage
For detailed information about the code coverage, see the test coverage report.
<!--021abf342d371248e50ceaed478a90ca-->
Reviews
See the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
-
DrahtBot commented at 7:32 PM on April 6, 2024: contributor
<!--85328a0da195eb286784d51f73fa0af9-->
🚧 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.
<sub>Debug: https://github.com/bitcoin/bitcoin/runs/23521358444</sub>
- DrahtBot added the label CI failed on Apr 6, 2024
- fanquake force-pushed on Apr 10, 2024
- fanquake force-pushed on Apr 10, 2024
-
dergoegge commented at 10:01 AM on April 10, 2024: member
Fuzzed for 2000 CPU hours, no more UB was found
- dergoegge approved
-
dergoegge commented at 10:03 AM on April 10, 2024: member
ACK c03fd4e58bfd1ce7f4e67283e64152690cf25c21
- fanquake force-pushed on Apr 11, 2024
- fanquake renamed this:
minisketch: pull subtree + #81
minisketch: pull subtree + #80 & #81
on Apr 11, 2024 - fanquake force-pushed on Apr 11, 2024
- fanquake force-pushed on Apr 11, 2024
- fanquake renamed this:
minisketch: pull subtree + #80 & #81
minisketch: pull subtree + #81
on Apr 11, 2024 -
sipa commented at 9:44 AM on April 12, 2024: member
https://github.com/sipa/minisketch/pull/81 is now merged upstream.
-
1eea10a6d2
Squashed 'src/minisketch/' changes from a571ba20f9..3472e2f5ec
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
-
Update minisketch subtree to latest master e58e1323a8
-
build: remove minisketch clz check 4722b7c715
- fanquake renamed this:
minisketch: pull subtree + #81
minisketch: update subtree to 3472e2f5ec75ace39ce9243af6b3fee233a67492
on Apr 12, 2024 - fanquake force-pushed on Apr 12, 2024
- fanquake marked this as ready for review on Apr 12, 2024
-
fanquake commented at 12:33 PM on April 12, 2024: member
https://github.com/sipa/minisketch/pull/81 is now merged upstream.
This is now ready for review.
- dergoegge approved
-
dergoegge commented at 12:36 PM on April 12, 2024: member
utACK 4722b7c7154e6130d4de66f7aed0fffe3c7c19a4
- DrahtBot removed the label CI failed on Apr 12, 2024
- hebasto approved
-
hebasto commented at 7:24 AM on April 14, 2024: member
ACK 4722b7c7154e6130d4de66f7aed0fffe3c7c19a4, I have verified the subtree update and reviewed the build system changes. Both look OK.
- fanquake merged this on Apr 15, 2024
- fanquake closed this on Apr 15, 2024
- fanquake deleted the branch on Apr 15, 2024
- hebasto referenced this in commit 49a902a59e on Apr 18, 2024
- hebasto referenced this in commit fd71331ef1 on Apr 18, 2024
- hebasto referenced this in commit eee7916868 on Apr 18, 2024
- kwvg referenced this in commit 94dca7f9ae on Oct 29, 2024
- PastaPastaPasta referenced this in commit 02ec0fd284 on Oct 29, 2024
- bitcoin locked this on Apr 15, 2025