backport: bitcoin#17946, #18663, #18946, #18975, #19004, #19115, #19152, #19173, partial #18735 #5802
Annotations
1 error and 3 warnings
|
validate potential conflicts
Process completed with exit code 1.
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
|
check for potential conflicts
{
pull_number: 5802,
conflictPrs: [
{
number: 4238,
files: [
'src/Makefile.am',
'src/bls/crypter.cpp',
'src/bls/keystore.cpp',
'src/keystore.cpp',
'src/keystore.h',
'src/script/interpreter.cpp',
'src/script/interpreter.h',
'src/script/script.cpp',
'src/script/script.h',
'src/script/script_error.cpp',
'src/script/script_error.h',
'src/script/sigcache.cpp',
'src/script/sigcache.h',
'src/script/sign.h',
'src/test/data/script_tests.json',
'src/wallet/crypter.cpp',
'src/wallet/crypter.h'
],
conflicts: [
'src/script/script.cpp',
'src/script/script.h',
'src/script/script_error.cpp',
'src/script/script_error.h'
]
},
{
number: 4321,
files: [
'src/Makefile.am',
'src/bls/bls.cpp',
'src/bls/bls.h',
'src/chainparams.cpp',
'src/chainparams.h',
'src/coinjoin/coinjoin-client.cpp',
'src/coinjoin/coinjoin-util.h',
'src/compressor.cpp',
'src/evo/simplifiedmns.cpp',
'src/interfaces/wallet.cpp',
'src/interfaces/wallet.h',
'src/key_io.cpp',
'src/key_io.h',
'src/keystore.cpp',
'src/keystore.h',
'src/rpc/governance.cpp',
'src/rpc/rpcevo.cpp',
'src/rpc/util.cpp',
'src/rpc/util.h',
'src/script/descriptor.cpp',
'src/script/interpreter.cpp',
'src/script/script.cpp',
'src/script/script.h',
'src/script/standard.cpp',
'src/script/standard.h',
'src/test/data/script_tests.json',
'src/test/test_dash.h',
'src/wallet/coincontrol.h',
'src/wallet/keypool.cpp',
'src/wallet/keypool.h',
'src/wallet/rpcwallet.cpp',
'src/wallet/test/coinjoin_tests.cpp',
'src/wallet/test/wallet_tests.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'src/wallet/walletdb.cpp',
'src/wallet/walletdb.h',
'test/lint/lint-circular-dependencies.sh'
],
conflicts: [
'src/script/script.cpp',
'src/script/script.h',
'src/script/standard.cpp',
'src/script/standard.h',
'src/wallet/rpcwallet.cpp'
]
},
{
number: 4686,
files: [
'configure.ac',
'depends/Makefile',
'depends/packages/packages.mk',
'depends/packages/qt.mk',
'src/bench/block_assemble.cpp',
'src/chainparams.cpp',
'src/chainparams.h',
'src/consensus/consensus.h',
'src/consensus/params.h',
'src/consensus/tx_verify.cpp',
'src/qt/paymentserver.cpp',
'src/qt/test/test_main.cpp',
'src/qt/transactiondesc.cpp',
'src/random.cpp',
'src/rpc/misc.cpp',
'src/txmempool.cpp',
'src/wallet/wallet.cpp',
'test/functional/feature_llmq_chainlocks.py',
'test/functional/test_framework/test_framework.py'
],
conflicts: [ 'configure.ac' ]
},
{
number: 5513,
files: [
'ci/dash/build-docker.sh',
'ci/dash/build_depends.sh',
'ci/dash/build_src.sh',
'ci/dash/matrix.sh',
'ci/dash/push-docker.sh',
'ci/dash/test_integrationtests.sh',
'ci/dash/test_unittests.sh',
'contrib/auto_gdb/common_helpers.py',
'contrib/auto_gdb/dash_dbg.sh',
'contrib/auto_gdb/log_size.py',
'contrib/auto_gdb/simple_class_obj.py',
'contrib/auto_gdb/stl_containers.py',
'contrib/auto_gdb/used_size.py',
'contrib/containers/deploy/docker-entrypoint.sh',
'src/batchedlogger.cpp',
'src/batchedlogger.h',
'src/bench/bls_dkg.cpp',
'src/bench/ecdsa.cpp',
'src/bitcoin-cli.cpp',
'src/bls/bls.cpp',
'src/bls/bls.h',
'src/bls/bls_batchverifier.h',
'src/bls/bls_ies.cpp',
'src/bls/bls_worker.cpp',
'src/cachemap.h',
'src/cachemultimap
|
|
check for potential conflicts
Potential conflicts detected!
|
The logs for this run have expired and are no longer available.
Loading