ci: Switch back to Bitcoin Core's master branch

[hebasto]

bitcoin/bitcoin#35084 has now been merged.

[DrahtBot]

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

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 <!--meta-tag:bot-skip--> into the comment that the bot should ignore.

[Sjors]

ACK 9a0ba89

[hebasto]

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

[Sjors]

Probably easiest to wait for #318.

Oh no, CI will always fail. I opened #323 to match the shim, and switch to master there.

[hebasto]

Closing in favour of #323.