backport: Merge bitcoin#24041, 20591 #6259
Draft
Annotations
4 warnings
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
check for potential conflicts
{
pull_number: 6259,
conflictPrs: [
{
number: 5598,
files: [
'configure.ac',
'src/coinjoin/client.h',
'src/coinjoin/context.cpp',
'src/core_write.cpp',
'src/evo/deterministicmns.h',
'src/evo/dmn_types.h',
'src/llmq/context.cpp',
'src/node/coinstats.cpp',
'src/qt/networkstyle.cpp',
'src/script/interpreter.cpp',
'src/script/script.h',
'src/test/fuzz/string.cpp',
'src/txmempool.cpp'
],
conflicts: [ 'src/test/fuzz/string.cpp' ]
},
{
number: 6378,
files: [
'configure.ac',
'src/Makefile.test.include',
'src/bench/ellswift.cpp',
'src/bitcoin-cli.cpp',
'src/bitcoin-tx.cpp',
'src/bitcoind.cpp',
'src/compat/byteswap.h',
'src/compat/cpuid.h',
'src/compat/endian.h',
'src/compat/stdin.cpp',
'src/crypto/chacha20.h',
'src/crypto/common.h',
'src/crypto/hkdf_sha256_32.h',
'src/crypto/hmac_sha256.h',
'src/crypto/hmac_sha512.h',
'src/crypto/pkcs5_pbkdf2_hmac_sha512.h',
'src/crypto/poly1305.h',
'src/crypto/ripemd160.h',
'src/crypto/sha1.h',
'src/crypto/sha256.h',
'src/crypto/sha256_sse4.cpp',
'src/crypto/sha3.h',
'src/crypto/sha512.h',
'src/dbwrapper.h',
'src/httpserver.cpp',
'src/i2p.cpp',
'src/ipc/interfaces.cpp',
'src/ipc/process.cpp',
'src/memusage.h',
'src/prevector.h',
'src/qt/utilitydialog.cpp',
'src/random.cpp',
'src/random.h',
'src/serialize.h',
'src/span.h',
'src/streams.h',
'src/support/cleanse.h',
'src/test/argsman_tests.cpp',
'src/test/blockchain_tests.cpp',
'src/test/bswap_tests.cpp',
'src/test/crypto_tests.cpp',
'src/test/fuzz/integer.cpp',
'src/test/raii_event_tests.cpp',
'src/test/util_tests.cpp',
'src/util/asmap.cpp',
'src/util/bip32.cpp',
'src/util/readwritefile.cpp',
'src/util/url.cpp',
'src/wallet/bdb.cpp',
'src/wallet/bdb.h',
'src/wallet/crypter.cpp',
'src/wallet/sqlite.cpp'
],
conflicts: [ 'src/test/util_tests.cpp' ]
}
]
}
|
check for potential conflicts
Potential conflicts detected!
|
Loading