Skip to content

backport: bitcoin-core/gui#154, #176, #221, #248, #251 - qt improvements and related fixes #13495

backport: bitcoin-core/gui#154, #176, #221, #248, #251 - qt improvements and related fixes

backport: bitcoin-core/gui#154, #176, #221, #248, #251 - qt improvements and related fixes #13495

Triggered via pull request July 23, 2024 06:48
@knstknst
synchronize #6111
Status Success
Total duration 40s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

4 warnings
main
The following actions uses Node.js version which is deprecated and will be forced to run on node20: actions/checkout@v3. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 6111, 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: 5971, files: [ '.gitlab-ci.yml', 'build-aux/m4/ax_cxx_compile_stdcxx.m4', 'ci/dash/matrix.sh', 'ci/test/00_setup_env_mac.sh', 'ci/test/00_setup_env_native_cxx20.sh', 'ci/test/00_setup_env_native_fuzz.sh', 'configure.ac', 'contrib/containers/ci/Dockerfile', 'contrib/devtools/security-check.py', 'contrib/devtools/symbol-check.py', 'contrib/devtools/test-security-check.py', 'contrib/devtools/test-symbol-check.py', 'contrib/guix/manifest.scm', 'depends/Makefile', 'depends/README.md', 'depends/hosts/darwin.mk', 'depends/packages/native_clang.mk', 'depends/packages/qt.mk', 'doc/dependencies.md', 'share/qt/Info.plist.in', 'src/util/hasher.h' ], conflicts: [ 'share/qt/Info.plist.in' ] }, { number: 6067, files: [ 'src/Makefile.am', 'src/evo/mnauth.cpp', 'src/evo/mnauth.h', 'src/net.cpp', 'src/net.h', 'src/net_processing.cpp', 'src/net_processing.h', 'src/qt/rpcconsole.cpp', 'src/rest.cpp', 'src/rpc/blockchain.cpp', 'src/rpc/blockchain.h', 'src/rpc/client.cpp', 'src/rpc/coinjoin.cpp', 'src/rpc/evo.cpp', 'src/rpc/governance.cpp', 'src/rpc/masternode.cpp', 'src/rpc/mining.cpp', 'src/rpc/misc.cpp', 'src/rpc/net.cpp', 'src/rpc/net.h', 'src/rpc/quorums.cpp', 'src/rpc/rawtransaction.cpp', 'src/rpc/server.cpp', 'src/rpc/server_util.cpp', 'src/rpc/server_util.h', 'src/test/denialofservice_tests.cpp', 'src/test/fuzz/net.cpp', 'src/test/fuzz/util.cpp', 'src/test/fuzz/util.h', 'src/test/net_tests.cpp', 'src/test/util/net.cpp', 'src/test/util/net.h', 'src/validation.cpp', 'test/functional/feature_minchainwork.py', 'test/functional/p2p_initial_headers_sync.py', 'test/functional/rpc_getblockfrompeer.py', 'test/functional/test_runner.py' ], conflicts: [ 'src/qt/rpcconsole.cpp' ] }, { number: 6128, files: [ 'src/coins.cpp', 'src/coins.h', 'src/consensus/consensus.h', 'src/consensus/tx_verify.cpp', 'src/index/coinstatsindex.cpp', 'src/interfaces/wallet.h', 'src/primitives/transaction.h', 'src/qt/transactiondesc.cpp', 'src/qt/transactionrecord.cpp', 'src/qt/transactionrecord.h', 'src/qt/transactiontablemodel.cpp', 'src/qt/transactionview.cpp', 'src/test/blockfilter_tests.cpp', 'src/test/coins_tests.cpp', 'src/test/fuzz/coins_view.cpp', 'src/txdb.cpp', 'src/txmempool.cpp', 'src/txmempool.h', 'src/wallet/interfaces.cpp', 'src/wallet/rpcwallet.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'test/functional/feature_asset_locks.py' ], conflicts: [ 'src/qt/transactionview.cpp' ] }, { number: 6097, files: [ 'src/Makefile.test_util.include', 'src/bench/rpc_blockchain.cpp',
main
Potential conflicts detected!