Skip to content

[28.x] Backports #33076

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
Jul 30, 2025
Merged

[28.x] Backports #33076

merged 5 commits into from
Jul 30, 2025

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Jul 28, 2025 •
edited
Loading

MarcoFalke and others added 3 commits July 24, 2025 15:22
@fanquake
test: Do not pass tests on unhandled exceptions
a828e64 
This adds a missing catch for BaseException (e.g. SystemExit), which
would otherwise be silently ignored.

Also, remove the redundant other catches, which are just calling
log.exception with a redundant log message.

Github-Pull: bitcoin#33001
Rebased-From: fa30b34
@fanquake
test: Log KeyboardInterrupt as exception
41fa1e0 
log.exception is more verbose and useful to debug timeouts.

Also, log stderr for CalledProcessError to make debugging easier.

Github-Pull: bitcoin#33001
Rebased-From: faa3e68
@romanz @fanquake
doc/zmq: fix unix socket path example
c09d82f 
Following https://github.com/bitcoin/bitcoin/blob/75a5c8258ec5309fe506438aa3815608430b53d6/doc/release-notes/release-notes-28.0.md?plain=1#L105

Github-Pull: bitcoin#33070
Rebased-From: e83699a
@fanquake fanquake added this to the 28.3 milestone Jul 28, 2025
@DrahtBot
Copy link
Contributor

DrahtBot commented Jul 28, 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/33076.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK willcl-ark, marcofleon

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

This was referenced Jul 28, 2025
Merged
Merged
willcl-ark and others added 2 commits July 29, 2025 16:51
@willcl-ark @fanquake
guix: warn SOURCE_DATE_EPOCH set in guix-codesign
8782e6c 
Currently there is a warning for this in guix-build, but we also need
one in guix-codesign, otherwise the codesigned hashes are not
reproducible.

Move common functionality into prelude and call the function in both
guix actions.

Github-Pull: bitcoin#33073
Rebased-From: 1bed0f7
@fanquake
doc: update release notes for 28.x
4d145f9
@fanquake fanquake force-pushed the 28_x_some_more_backport branch from 04893d9 to 4d145f9 Compare July 29, 2025 15:53
@fanquake fanquake mentioned this pull request Jul 29, 2025
Merged
@fanquake fanquake marked this pull request as ready for review July 30, 2025 09:57
@fanquake fanquake requested a review from willcl-ark July 30, 2025 09:57
willcl-ark
willcl-ark approved these changes Jul 30, 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 4d145f9

Checked that backports are clean, and attributed correctly.

marcofleon
marcofleon reviewed Jul 30, 2025
View reviewed changes
Copy link
Contributor

@marcofleon marcofleon left a comment

Choose a reason for hiding this comment

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

lgtm ACK 4d145f9

@fanquake fanquake merged commit 5492e1b into bitcoin:28.x Jul 30, 2025
18 of 20 checks passed
@fanquake fanquake deleted the 28_x_some_more_backport branch July 30, 2025 14:31
@fanquake
Copy link
Member Author

Guix Build (aarch64):

9ef8edcd797ec28b927c50bcab2bb1ab31f5990ff08671081e6a62391c22c089  guix-build-5492e1be3b40/output/aarch64-linux-gnu/SHA256SUMS.part
d269e0b8610943a4eb061088c139f9840ebbdeb3a1884a2d1f2d13967b01ddf6  guix-build-5492e1be3b40/output/aarch64-linux-gnu/bitcoin-5492e1be3b40-aarch64-linux-gnu-debug.tar.gz
4fc9874cd91344348602a91b6ab680293f6aa1afb5bab54147bdcfe3c69c8777  guix-build-5492e1be3b40/output/aarch64-linux-gnu/bitcoin-5492e1be3b40-aarch64-linux-gnu.tar.gz
899d2dc6b8f13133891815a225484d7762811e77da3921be1416ace80664d38b  guix-build-5492e1be3b40/output/arm-linux-gnueabihf/SHA256SUMS.part
5b9afba37eeeb88f99f8827febc5d2053cb1b07759cbb58c390a388172fb2ea1  guix-build-5492e1be3b40/output/arm-linux-gnueabihf/bitcoin-5492e1be3b40-arm-linux-gnueabihf-debug.tar.gz
6651000576bc8baf624d24d9f6df6214d617cf1c2dd2ebf2d233e97b4baa6785  guix-build-5492e1be3b40/output/arm-linux-gnueabihf/bitcoin-5492e1be3b40-arm-linux-gnueabihf.tar.gz
5565a4638f00dd69b54d374724257e785eddc983c1e85a458c65582bdd199de7  guix-build-5492e1be3b40/output/arm64-apple-darwin/SHA256SUMS.part
f35275331dd73ebc4c6f4eac10f8e3cc7f3bb48311512a511a6d9dc3314c602f  guix-build-5492e1be3b40/output/arm64-apple-darwin/bitcoin-5492e1be3b40-arm64-apple-darwin-codesigning.tar.gz
70de998dd7eac32e96007235b6452de7f8e64ca1a8c75160e5b164808eed5438  guix-build-5492e1be3b40/output/arm64-apple-darwin/bitcoin-5492e1be3b40-arm64-apple-darwin-unsigned.tar.gz
781187f604e1af5b2e9ca6f98f81b3848d8dace8313bc3d7400218e3622108bd  guix-build-5492e1be3b40/output/arm64-apple-darwin/bitcoin-5492e1be3b40-arm64-apple-darwin-unsigned.zip
3c7728fd61d714836f2d7df52c4d60fcb33bca928c33eff2deb47bfaf0308cf2  guix-build-5492e1be3b40/output/dist-archive/bitcoin-5492e1be3b40.tar.gz
786c54025196a8e0fa601589518fec079052c710c4e65a67972213ad9091cf5e  guix-build-5492e1be3b40/output/powerpc64-linux-gnu/SHA256SUMS.part
8a6e8613d1de58597df2ff4c8de4ed5559ac05a897ff4accbd3ecb697927efe5  guix-build-5492e1be3b40/output/powerpc64-linux-gnu/bitcoin-5492e1be3b40-powerpc64-linux-gnu-debug.tar.gz
29435a9b15fbdfe2eedb7cec40cf623aa34b3d653375c83fc1efdf88efd992b0  guix-build-5492e1be3b40/output/powerpc64-linux-gnu/bitcoin-5492e1be3b40-powerpc64-linux-gnu.tar.gz
545140fac4250764b26261ea224d02bbc19937bd892b68515a9258a455ca61fb  guix-build-5492e1be3b40/output/riscv64-linux-gnu/SHA256SUMS.part
992a784c063499d502c0123514fa5cbb3841ced0b7f05eaca5d76954d5bda95f  guix-build-5492e1be3b40/output/riscv64-linux-gnu/bitcoin-5492e1be3b40-riscv64-linux-gnu-debug.tar.gz
3bae9524f1b83b5070d38b38c471234a4fe4f9bce6d361c3140bce5ba42c5e2d  guix-build-5492e1be3b40/output/riscv64-linux-gnu/bitcoin-5492e1be3b40-riscv64-linux-gnu.tar.gz
11c5d30299866887bf763b87a4157f444197e1b5d186609a52bdc7698a1f1b3d  guix-build-5492e1be3b40/output/x86_64-apple-darwin/SHA256SUMS.part
77e07ac6ea09c8c8d77c72be762ff4e9b808e4a419d81536e584f4f144cf7e9a  guix-build-5492e1be3b40/output/x86_64-apple-darwin/bitcoin-5492e1be3b40-x86_64-apple-darwin-codesigning.tar.gz
0291b5e6f3ff378cffb49d53a39f16e17835d48554122876200120c835584b63  guix-build-5492e1be3b40/output/x86_64-apple-darwin/bitcoin-5492e1be3b40-x86_64-apple-darwin-unsigned.tar.gz
4b076a16e4e5d10c35671770912618f2103d9a8460058675211baaf1f35c2f14  guix-build-5492e1be3b40/output/x86_64-apple-darwin/bitcoin-5492e1be3b40-x86_64-apple-darwin-unsigned.zip
379b2eb3540bcceb7888fd751164534be114edb17e711dcbbeb20454bb731402  guix-build-5492e1be3b40/output/x86_64-linux-gnu/SHA256SUMS.part
4039737c365da88252e687f382555f5dd23eed0e9d184012331f6d1a515178c4  guix-build-5492e1be3b40/output/x86_64-linux-gnu/bitcoin-5492e1be3b40-x86_64-linux-gnu-debug.tar.gz
46b26ed3592c116033787c8f98ffafb04dae335e7d2f4d31c380fe224210aa7a  guix-build-5492e1be3b40/output/x86_64-linux-gnu/bitcoin-5492e1be3b40-x86_64-linux-gnu.tar.gz
25449fa5adcd9b5aa029db72c19174e6c86ece8043c83b43b73440e3fdd79e16  guix-build-5492e1be3b40/output/x86_64-w64-mingw32/SHA256SUMS.part
efb415fb4cbd1ecc08bd2a4fe60ca5b2a37087d7382e2699e286e7afc52e3f31  guix-build-5492e1be3b40/output/x86_64-w64-mingw32/bitcoin-5492e1be3b40-win64-codesigning.tar.gz
6a2ac97559050bc9e320d0e13552efea2f51591f2b8e14e3d18f1a5f9d57e94a  guix-build-5492e1be3b40/output/x86_64-w64-mingw32/bitcoin-5492e1be3b40-win64-debug.zip
0e18b2d02c13dbe8c5b1534148b29ae1881005dd89b61a317fb6312dbfc3489b  guix-build-5492e1be3b40/output/x86_64-w64-mingw32/bitcoin-5492e1be3b40-win64-setup-unsigned.exe
fae0b4d25cf8b5136801361bfa2ceead826762e77b22ff3b67469eddce25571a  guix-build-5492e1be3b40/output/x86_64-w64-mingw32/bitcoin-5492e1be3b40-win64-unsigned.zip

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

@marcofleon marcofleon marcofleon left review comments

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

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

Successfully merging this pull request may close these issues.
5 participants
@fanquake @DrahtBot @willcl-ark @marcofleon @romanz