Skip to content

backport: merge bitcoin-core/gui#180, #203, #179, #219, #214, #166, #296, #194, #280, #325, partial bitcoin-core/gui#79 (qt backports) #12840

backport: merge bitcoin-core/gui#180, #203, #179, #219, #214, #166, #296, #194, #280, #325, partial bitcoin-core/gui#79 (qt backports)

backport: merge bitcoin-core/gui#180, #203, #179, #219, #214, #166, #296, #194, #280, #325, partial bitcoin-core/gui#79 (qt backports) #12840

Triggered via pull request June 9, 2024 16:55
@kwvgkwvg
opened #6049
Status Failure
Total duration 30s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

1 error and 4 warnings
main
Process completed with exit code 1.
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: 6049, conflictPrs: [ { 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: [ 'src/qt/paymentserver.cpp' ] }, { number: 3362, files: [ 'src/qt/transactiontablemodel.cpp', 'src/qt/transactiontablemodel.h', 'src/qt/walletmodel.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h' ], conflicts: [ 'src/qt/transactiontablemodel.cpp' ] }, { number: 5943, files: [ 'src/Makefile.am', 'src/Makefile.test.include', 'src/governance/governance.cpp', 'src/llmq/blockprocessor.cpp', 'src/llmq/chainlocks.cpp', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/instantsend.cpp', 'src/llmq/signing.cpp', 'src/net.h', 'src/net_processing.cpp', 'src/net_processing.h', 'src/protocol.h', 'src/spork.cpp', 'src/spork.h', 'src/test/fuzz/txrequest.cpp', 'src/test/txrequest_tests.cpp', 'src/txrequest.cpp', 'src/txrequest.h', 'test/functional/p2p_tx_download.py' ], conflicts: [ 'src/net.h' ] }, { number: 6031, files: [ 'contrib/seeds/generate-seeds.py', 'doc/README.md', 'doc/cjdns.md', 'doc/i2p.md', 'doc/release-notes-22834.md', 'doc/tor.md', 'src/init.cpp', 'src/interfaces/node.h', 'src/net.cpp', 'src/net.h', 'src/netaddress.cpp', 'src/netaddress.h', 'src/netbase.cpp', 'src/netbase.h', 'src/node/interfaces.cpp', 'src/qt/clientmodel.cpp', 'src/qt/optionsdialog.cpp', 'src/rpc/net.cpp', 'src/test/net_peer_eviction_tests.cpp', 'src/test/net_tests.cpp', 'src/test/netbase_tests.cpp', 'src/torcontrol.cpp', 'test/functional/feature_proxy.py', 'test/functional/interface_bitcoin_cli.py', 'test/functional/rpc_net.py' ], conflicts: [ 'src/net.h' ] }, { number: 6018, files: [ 'src/i2p.cpp', 'src/masternode/node.cpp', 'src/net.cpp', 'src/net.h', 'src/netbase.cpp', 'src/netbase.h', 'src/test/denialofservice_tests.cpp', 'src/test/fuzz/fuzz.cpp', 'src/test/fuzz/i2p.cpp', 'src/test/fuzz/util.cpp', 'src/test/fuzz/util.h', 'src/test/i2p_tests.cpp', 'src/test/net_tests.cpp', 'src/test/util/net.h', 'src/util/sock.cpp', 'src/util/sock.h', 'src/util/time.cpp', 'src/util/time.h' ], conflicts: [ 'src/net.h' ] }, { number: 6043, files: [ 'src/Makefile.am', 'src/Makefile.test.include', 'src/addrdb.cpp', 'src/addrdb.h', 'src/addrman.cpp', 'src/addrman.h', 'src/addrman_impl.h', 'src/bench/addrman.cpp', 'src/init.cpp', 'src/net.cpp', 'src/net.h', 'src/net_processing.cpp', 'src/net_processing.h', 'src/netaddress.cpp', 'src/netaddress.h', 'src/node/context.h', '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/fuzz/net.cpp', 'src/test
main
Potential conflicts detected!