backport: Merge bitcoin#28755, 28865, 31225, (partial) 31718, 28966 #26411
Triggered via pull request
June 21, 2026 16:57
vijaydasmp
vijaydasmp
synchronize
#7364
Status
Failure
Total duration
30s
Artifacts
–
predict-conflicts.yml
on: pull_request_target
predict_conflicts
28s
Annotations
2 errors and 3 warnings
|
predict_conflicts
Process completed with exit code 1.
|
|
predict_conflicts
Process completed with exit code 1.
|
|
predict_conflicts
Potential conflicts detected!
|
|
predict_conflicts
{
pull_number: 7364,
conflictPrs: [
{
number: 7217,
files: [
'Makefile.am',
'ci/lint/04_install.sh',
'configure.ac',
'contrib/containers/ci/ci-slim.Dockerfile',
'src/.bear-tidy-config',
'test/bench/bench_framework.py',
'test/bench/bench_helpers.py',
'test/bench/bench_results.py',
'test/bench/bench_runner.py',
'test/bench/example_bench.py',
'test/bench/mempool_bench.py',
'test/bench/rest_bench.py',
'test/bench/rpc_bench.py',
'test/bench/zmq_bench.py'
],
conflicts: [ 'configure.ac' ]
},
{
number: 7109,
files: [
'.cargo/config.toml.offline',
'.gitignore',
'Cargo.lock',
'Cargo.toml',
'Makefile.am',
'configure.ac',
'contrib/containers/ci/ci.Dockerfile',
'contrib/devtools/update-native-cxxbridge.py',
'contrib/devtools/update-rust-hashes.py',
'contrib/guix/guix-build',
'contrib/guix/libexec/build.sh',
'contrib/guix/manifest.scm',
'contrib/guix/symbol-check.py',
'depends/Makefile',
'depends/config.site.in',
'depends/funcs.mk',
'depends/packages/native_cxxbridge.mk',
'depends/packages/native_rust.mk',
'depends/packages/packages.mk',
'depends/packages/rust_stdlib.mk',
'depends/packages/rustcxx.mk',
'depends/patches/native_cxxbridge/Cargo.lock',
'depends/patches/native_cxxbridge/cargo-config.toml',
'depends/patches/native_rust/fix-elf-interpreter.sh',
'rust-toolchain.toml',
'rust/Makefile.am',
'rust/Makefile.chirp.include',
'rust/Makefile.libs.include',
'rust/chirp/Cargo.toml',
'rust/chirp/build.rs',
'rust/chirp/src/lib.rs',
'src/Makefile.am',
'src/Makefile.bench.include',
'src/Makefile.qt.include',
'src/Makefile.qttest.include',
'src/Makefile.test.include',
'src/init.cpp',
'test/lint/lint-files.py',
'test/lint/lint-format-strings.py',
'test/lint/lint-include-guards.py',
'test/lint/lint-includes.py',
'test/lint/lint-locale-dependence.py',
'test/lint/lint-python-utf8-encoding.py',
'test/lint/lint-python.py',
'test/lint/lint-shell-locale.py',
'test/lint/lint-shell.py',
'test/lint/lint-spelling.py',
'test/lint/lint-whitespace.py'
],
conflicts: [ 'configure.ac' ]
},
{
number: 7220,
files: [
'Makefile.am',
'ci/lint/04_install.sh',
'ci/test/00_setup_env_native_nowallet.sh',
'configure.ac',
'contrib/containers/ci/ci-slim.Dockerfile',
'depends/packages/drogon.mk',
'depends/packages/jsoncpp.mk',
'depends/packages/packages.mk',
'depends/packages/qt.mk',
'depends/packages/trantor.mk',
'depends/packages/zlib.mk',
'doc/REST-interface.md',
'src/.bear-tidy-config',
'src/Makefile.am',
'src/Makefile.bench.include',
'src/Makefile.qt.include',
'src/Makefile.qttest.include',
'src/Makefile.test.include',
'src/chainparamsbase.cpp',
'src/chainparamsbase.h',
'src/httprpc.h',
'src/init.cpp',
'src/logging.cpp',
'src/logging.h',
'src/rest.h',
'src/rest/reader.cpp',
'src/rest/reader.h',
'src/rest/server.cpp',
'src/rest/server.h',
'src/test/rest_tests.cpp',
'src/util/sock.cpp',
'src/util/sock.h',
'src/util/system.cpp',
'test/bench/bench_framework.py',
'test/bench/bench_helpers.py',
'test/bench/bench_results.py',
'test/bench/bench_runner.py',
'test/bench/example_bench.py',
'test/bench/mempool_bench.py',
'test/bench/rest_bench.py',
'test/bench/rpc_bench.py',
'test/bench/zmq_bench.py',
'test/config.ini.in',
'test/functional/feature_rest.py',
|
|
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|