Repository navigation
[pull] master from bitcoin:master - #1873
Merged
Merged
Conversation
… in offline-signing-tutorial.md funded_psbt.txt and final_psbt.txt are each expected to hold exactly one PSBT/hex string, consumed via unquoted $(cat ...) in every later step. Using append (>>) instead of overwrite (>) means re-running the send or walletprocesspsbt step without deleting the output file first appends a second line, which $(cat ...) then word-splits into two arguments, causing decodepsbt/analyzepsbt/walletprocesspsbt/sendrawtransaction to reject the call with too many arguments. Fixes #35862.
The Windows cross-toolchain build can exceed BuildKit's default 2 MiB per-step log limit, which hides useful output. Raise the limit to 5 MiB for both CI builder configurations. This retains substantially more diagnostics without enabling unlimited logs.
Guix release binaries use the POSIX GCC thread model, but the pinned Nixpkgs cross compiler defaults to MCF. Select POSIX through the Nixpkgs threads hook so GCC and its target libraries agree. Leave threads.package null because making winpthreads a target dependency exposes its headers to native GCC build tools. Supply its headers and libraries through EXTRA_*_FOR_TARGET for target libraries instead. Add winpthreads to the compiler wrapper so builds in the shell get its include and library paths without manual NIX_CFLAGS_COMPILE or NIX_LDFLAGS exports.
BuildKit can truncate the compiler build log, hiding its configure flags. Print the compiler version and thread model when CI enters the Nix test shell so a mismatch is visible in the job output.
9fd18ae ci: print Windows cross compiler thread model (will) 1d59d5a ci: use POSIX threads in Nix Windows cross shell (will) 96d487c ci: raise BuildKit step log limit (will) Pull request description: Guix release binaries use GCC’s POSIX thread model, while the pinned Nixpkgs toolchain defaults to mcf. This makes POSIX the default for Nix Windows cross builds. Nightly builds can select `mcf` or `win32` with the `threadModel` argument. The Nixpkgs `threads` setting selects the model before GCC is built. Only the mcf model pulls in `mcfgthreads`. For POSIX, GCC’s target libraries need winpthreads headers and libraries during the compiler build. The `EXTRA_*_FOR_TARGET` flags provide those paths without exposing target headers to GCC’s native build tools, which caused the earlier build failure. The compiler wrapper includes winpthreads through `extraPackages`, so the shell no longer needs to export pthread include and library flags manually. CI also prints GCC’s configured thread model to make mismatches visible. Fixes #36314 ACKs for top commit: hebasto: ACK 9fd18ae. Tree-SHA512: b8ce5b19c82ecc347df161e4698d7f023c82b83f1907fea35b66ca37f54a00f1011dbd7642ba4d7ce2ca9ffd16e48e9327b69caa4108a44ca451194ac070e389
…hot PSBT files in offline-signing-tutorial.md be30864 doc: use overwrite (>) instead of append (>>) for one-shot PSBT files in offline-signing-tutorial.md (GuTS805) Pull request description: `funded_psbt.txt` and `final_psbt.txt` should only ever have one line in them, since later steps just do `$(cat ...)` to read them back. but the tutorial uses `>>` (append) instead of `>` (overwrite), so if you run the `send` or `walletprocesspsbt` step twice without deleting the file, it adds a second line instead of replacing the first one. then `$(cat ...)` picks up both lines as separate args and the next command fails with too many arguments. Fixes #35862. ACKs for top commit: Sjors: ACK be30864 sedited: ACK be30864 Tree-SHA512: af388ffd3f0beb6e9d0e54e5e745d36380f11cdbea64c3563015aded882872401a4a3032c46493381a8b5eed510530a2c3f5a81701d7d3039c9c1c9741a8bd7b
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )