Skip to content

backport: trivial 2024 10 25 pr1 #15480

backport: trivial 2024 10 25 pr1

backport: trivial 2024 10 25 pr1 #15480

Triggered via pull request October 26, 2024 17:27
@PastaPastaPastaPastaPastaPasta
synchronize #6362
Status Success
Total duration 1m 13s
Artifacts

predict-conflicts.yml

on: pull_request_target
predict_conflicts
18s
predict_conflicts
Fit to window
Zoom out
Zoom in

Annotations

4 warnings
predict_conflicts
The following actions use a deprecated Node.js version 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/
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
predict_conflicts
{ pull_number: 6362, conflictPrs: [ { 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/symbol-check.py' ] }, { number: 6182, files: [ 'src/governance/common.cpp', 'src/governance/common.h', 'src/governance/governance.cpp', 'src/governance/object.cpp', 'src/governance/object.h', 'src/interfaces/node.h', 'src/rpc/governance.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'test/functional/feature_governance.py', 'test/functional/feature_governance_cl.py', 'test/functional/feature_governance_objects.py', 'test/functional/interface_zmq_dash.py', 'test/functional/test_framework/governance.py', 'test/functional/test_framework/messages.py' ], conflicts: [ 'test/functional/test_framework/messages.py' ] }, { number: 6018, files: [ 'src/i2p.cpp', 'src/masternode/node.cpp', 'src/net.cpp', 'src/net.h', 'src/netbase.cpp', 'src/netbase.h', '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/util/net.h', 'src/util/sock.cpp', 'src/util/sock.h', 'src/util/time.cpp', 'src/util/time.h' ], conflicts: [ 'src/netbase.cpp' ] }, { number: 6305, files: [ 'src/net.cpp', 'src/wallet/rpcdump.cpp', 'test/functional/feature_coinstatsindex.py', 'test/functional/test_framework/util.py', 'test/functional/test_runner.py' ], conflicts: [ 'test/functional/feature_coinstatsindex.py' ] }, { number: 6258, files: [ 'src/bitcoin-wallet.cpp', 'src/qt/forms/createwalletdialog.ui', 'src/wallet/rpcwallet.cpp', 'src/wallet/wallettool.cpp', 'test/functional/feature_coinstatsindex.py', 'test/functional/interface_bitcoin_cli.py', 'test/functional/test_runner.py', 'test/functional/tool_wallet.py' ], conflicts: [ 'test/functional/feature_coinstatsindex.py' ] }, { number: 6363, files: [ 'build-aux/m4/l_atomic.m4', 'contrib/guix/libexec/build.sh', 'contrib/init/dashd.service', 'depends/README.md', 'depends/funcs.mk', 'depends/hosts/darwin.mk', 'depends/hosts/linux.mk', 'depends/hosts/mingw32.mk', 'depends/packages/boost.mk', 'depends/packages/sqlite.mk', 'depends/patches/boost/process_macos_sdk.patch', 'doc/descriptors.md', 'src/net.cpp', 'src/net.h', 'src/qt/utilitydialog.cpp', 'src/randomenv.cpp', 'src/test/streams_tests.cpp', 'src/util/time.cpp', 'test/functional/mempool_packages.py', 'test/functional/p2p_compactblocks_hb.py', 'test/functional/test_framework/test_framework.py', 'test/functional/wallet_groups.py', 'test/lint/commit-script-check.sh' ], conflicts: [ 'depends/funcs.mk', 'src/randomenv.cpp' ] }, { number: 6333, files: [ 'doc/release-notes-6
predict_conflicts
Potential conflicts detected!