bitcoin/bitcoin#35084 has now been merged.
ci: Switch back to Bitcoin Core's master branch #322
pull hebasto wants to merge 1 commits into bitcoin-core:master from hebasto:260729-ci-core changing 1 files +1 −2-
hebasto commented at 8:55 AM on July 29, 2026: member
-
9a0ba892b6
ci: Switch back to Bitcoin Core's master branch
bitcoin/bitcoin#35084 has now been merged.
-
DrahtBot commented at 8:55 AM on July 29, 2026: none
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--021abf342d371248e50ceaed478a90ca-->
Reviews
See the guideline and AI policy for information on the review process.
Type Reviewers ACK Sjors If your review is incorrectly listed, please copy-paste <code><!--meta-tag:bot-skip--></code> into the comment that the bot should ignore.
<!--5faf32d7da4f0f540f40219e4f7537a3-->
-
Sjors commented at 9:16 AM on July 29, 2026: member
~ACK 9a0ba892b6717d075053cb8a2a16de261c6e1010~
-
hebasto commented at 10:07 AM on July 29, 2026: member
Apparently, Bitcoin Core needs a patch:
--- a/src/ipc/capnp/protocol.cpp +++ b/src/ipc/capnp/protocol.cpp @@ -9,6 +9,7 @@ #include <ipc/capnp/protocol.h> #include <ipc/exception.h> #include <ipc/protocol.h> +#include <ipc/util.h> #include <kj/async.h> #include <mp/proxy-io.h> #include <mp/proxy-types.h> --- a/src/ipc/util.h +++ b/src/ipc/util.h @@ -53,12 +53,12 @@ inline SocketId StartSpawned(const std::string& connect_info) if (!socket) throw std::invalid_argument(strprintf("Invalid socket descriptor '%s'", connect_info)); return *socket; } +#endif inline ThreadContext& CurrentThread() { return g_thread_context; } -#endif } // namespace mp #endif // BITCOIN_IPC_UTIL_H -
-
- hebasto closed this on Jul 29, 2026
- ryanofsky referenced this in commit f5c15ce33f on Jul 30, 2026
- hebasto deleted the branch on Jul 30, 2026
