Skip to content

backport: trivial 2024 07 25 #14014

backport: trivial 2024 07 25

backport: trivial 2024 07 25 #14014

Triggered via pull request August 12, 2024 04:53
@PastaPastaPastaPastaPastaPasta
synchronize #6158
Status Success
Total duration 32s
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: 6158, 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/random.cpp' ] }, { number: 5600, files: [ 'src/constexpr_if_cxx20.h', 'src/netaddress.cpp', 'src/netaddress.h' ], conflicts: [ 'src/netaddress.cpp' ] }, { number: 5799, files: [ 'src/bloom.cpp', 'src/bloom.h', 'src/chainparams.cpp', 'src/consensus/params.h', 'src/deploymentinfo.cpp', 'src/evo/deterministicmns.cpp', 'src/evo/dmnstate.cpp', 'src/evo/dmnstate.h', 'src/evo/providertx.cpp', 'src/evo/providertx.h', 'src/evo/simplifiedmns.cpp', 'src/evo/simplifiedmns.h', 'src/llmq/ehf_signals.cpp', 'src/masternode/payments.cpp', 'src/qt/masternodelist.cpp', 'src/rpc/blockchain.cpp', 'src/rpc/evo.cpp', 'src/rpc/masternode.cpp', 'src/test/block_reward_reallocation_tests.cpp', 'src/test/data/trivially_invalid.json', 'src/test/data/trivially_valid.json', 'src/test/evo_deterministicmns_tests.cpp', 'src/test/evo_trivialvalidation.cpp', 'test/functional/feature_dip0026.py', 'test/functional/feature_dip3_deterministicmns.py', 'test/functional/feature_llmq_evo.py', 'test/functional/rpc_blockchain.py', 'test/functional/rpc_masternode.py', 'test/functional/test_framework/test_framework.py', 'test/functional/test_runner.py' ], conflicts: [ 'src/rpc/blockchain.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: [ 'contrib/devtools/security-check.py', 'contrib/devtools/test-security-check.py' ] }, { number: 6067, files: [ 'src/Makefile.am', 'src/Makefile.bench.include', 'src/bench/load_external.cpp', 'src/bench/rpc_blockchain.cpp', 'src/chain.cpp', 'src/chain.h', 'src/dsnotificationinterface.cpp', 'src/dsnotificationinterface.h', 'src/evo/mnauth.cpp', 'src/evo/mnauth.h', 'src/governance/governance.cpp', 'src/governance/governance.h', 'src/init.cpp', 'src/llmq/blockprocessor.cpp', 'src/llmq/chainlocks.cpp', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/instantsend.cpp', 'src/llmq/instantsend.h', 'src/llmq/signing.cpp', 'src/masternode/sync.cpp', 'src/masternode/sync.h', 'src/net.cpp', 'src/net.h', 'src/net_pro
main
Potential conflicts detected!