backport: Merge bitcoin#22496, 21985 #12602
Triggered via pull request
May 17, 2024 10:13
vijaydasmp
synchronize
#6024
Status
Success
Total duration
28s
Artifacts
–
Annotations
4 warnings
main
Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
|
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
main
{
pull_number: 6024,
conflictPrs: [
{
number: 6025,
files: [
'src/addrman.cpp',
'src/addrman.h',
'src/bench/addrman.cpp',
'src/init.cpp',
'src/rpc/rawtransaction.cpp',
'src/test/addrman_tests.cpp',
'src/test/fuzz/addrman.cpp',
'src/test/fuzz/connman.cpp',
'src/test/fuzz/data_stream.cpp',
'src/test/fuzz/deserialize.cpp',
'src/test/miner_tests.cpp',
'src/test/net_tests.cpp',
'src/txmempool.cpp',
'src/txmempool.h',
'src/validation.cpp',
'src/validation.h',
'src/wallet/wallet.cpp',
'test/functional/mempool_package_limits.py',
'test/functional/rpc_packages.py',
'test/functional/test_framework/wallet.py',
'test/functional/test_runner.py'
],
conflicts: [ 'src/addrman.cpp', 'src/addrman.h' ]
},
{
number: 6026,
files: [
'src/addrman.cpp',
'src/addrman.h',
'src/clientversion.cpp',
'src/clientversion.h',
'src/rpc/client.cpp',
'src/rpc/net.cpp',
'src/test/addrman_tests.cpp',
'src/test/fuzz/addrman.cpp',
'src/test/net_tests.cpp',
'src/wallet/coinselection.cpp',
'src/wallet/rpcdump.cpp',
'src/wallet/rpcwallet.cpp',
'test/functional/rpc_fundrawtransaction.py',
'test/functional/wallet_backup.py'
],
conflicts: [ 'src/addrman.cpp', 'src/addrman.h' ]
}
]
}
|
main
Potential conflicts detected!
|