The test-each-commit task will often fail, when the CI config yaml is updated along with code changes.
This is because, GitHub seems to be merging the CI config on a fresh pull with the current target branch (master). However, the code changes are not.
A tedious workaround would be for every developer to rebase on every intermittent (https://github.com/bitcoin/bitcoin/issues/31946#issuecomment-2740911853) and non-intermittent CI issue.
However, fix this instead by merging with master.
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--006a51241073e994b41acfe9ec718e94-->
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32203.
<!--021abf342d371248e50ceaed478a90ca-->
See the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
<!--174a7506f384e20aa4161008e828411d-->
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
<!--85328a0da195eb286784d51f73fa0af9-->
🚧 At least one of the CI tasks failed. <sub>Debug: https://github.com/bitcoin/bitcoin/runs/39862623915</sub>
<details><summary>Hints</summary>
Try to run the tests locally, according to the documentation. However, a CI failure may still happen due to a number of reasons, for example:
Possibly due to a silent merge conflict (the changes in this pull request being incompatible with the current code in the target branch). If so, make sure to rebase on the latest commit of the target branch.
A sanitizer issue, which can only be found by compiling with the sanitizer and running the affected test.
An intermittent issue.
Leave a comment here, if you need help tracking down a confusing failure.
</details>
An example failure can be seen in https://github.com/bitcoin/bitcoin/actions/runs/14225501221/job/39863973090?pr=32203:
-- Could NOT find Qt5 (missing: Qt5_DIR)
CMake Error at /usr/local/share/cmake-4.0/Modules/FindPackageHandleStandardArgs.cmake:227 (message):
Could NOT find Qt (missing: Qt5_DIR) (Required is at least version
"5.11.3")
Hopefully, it will be fixed by the next commit.
Concept and Approach ACK faa4fbc6c3f33e9642d41538577aae80abd18f21.
The last commit can be dropped now as the "test each commit" CI job has succeed.
Sure, squashed.
For reference, the passing CI was https://github.com/bitcoin/bitcoin/actions/runs/14226088164/job/39865851320?pr=32203
ACK faa807bdf8c3002a28005b4765604f518a6f2736.
cc @willcl-ark
Concept ACK, i think "every intermediate commit should merge cleanly into master" might put some extra onus on contributors, but it's better than forcing a rebase of everything every time there's a significant change to the build system.
i think "every intermediate commit should merge cleanly into master" might put some extra onus on contributors, but it's better than forcing a rebase of everything every time there's a significant change to the build system.
This is true. I suspect the issue could only arise when something is removed/added in one commit and then reverted in another commit. Though, this should be avoided anyway, and real cases where this is an issue should hopefully be rare.
Note that the code here didn't actually work. See the failed run in https://github.com/bitcoin/bitcoin/actions/runs/14259358898/job/39967624081?pr=30756, and the followup: #32218.
Yeah, sorry for missing this. Effectively this only fixed the issue of merging into master (when it works). Though, when the CI previously failed with the QT6 error, it will still fail with a different "bash script missing" error.
So this was an improvement, but it didn't fix all issues. :(
