This is for the upcoming 32.x, because I presume users and devs are more likely using a later distro. This comes with tool bumps, such as:
<!--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/35288.
<!--021abf342d371248e50ceaed478a90ca-->
See the guideline for information on the review process.
If your review is incorrectly listed, please copy-paste <code><!--meta-tag:bot-skip--></code> into the comment that the bot should ignore.
<!--5faf32d7da4f0f540f40219e4f7537a3-->
5 | @@ -6,7 +6,7 @@ 6 | 7 | export LC_ALL=C.UTF-8 8 | 9 | -export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie" 10 | +export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
Can you please explain somewhere why the remaining ones were skipped?
Is it because the changed ones are mostly about testing and these are rather cross-build/tooling?
But what about 00_setup_env_native_iwyu.sh, if we removed the APT_LLVM_V overwrite it does seem to work for me locally:
diff --git a/ci/test/00_setup_env_native_iwyu.sh b/ci/test/00_setup_env_native_iwyu.sh
--- a/ci/test/00_setup_env_native_iwyu.sh (revision fa729537cc2c664b2c2ca4185a7972a95f958a7b)
+++ b/ci/test/00_setup_env_native_iwyu.sh (revision 23ee76672f4190d98f8449c54f60c6344250b25d)
@@ -6,10 +6,9 @@
export LC_ALL=C.UTF-8
-export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie" # To build codegen, CMake must be 3.31 or newer.
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
export CONTAINER_NAME=ci_native_iwyu
export IWYU_LLVM_V="22"
-export APT_LLVM_V="${IWYU_LLVM_V}"
export PACKAGES="clang-${IWYU_LLVM_V} clang-format-${IWYU_LLVM_V} libclang-${IWYU_LLVM_V}-dev llvm-${IWYU_LLVM_V}-dev jq libevent-dev libboost-dev libzmq3-dev systemtap-sdt-dev qt6-base-dev qt6-tools-dev qt6-l10n-tools libqrencode-dev libsqlite3-dev libcapnp-dev capnproto"
export NO_DEPENDS=1
export RUN_UNIT_TESTS=false
Can you please explain somewhere why the remaining ones were skipped?
* 00_setup_env_arm.sh * 00_setup_env_mac_cross.sh * 00_setup_env_mac_cross_intel.sh * 00_setup_env_win64.sh * 00_setup_env_win64_msvcrt.sh
Have you read those files, and the comment in them explaining why it is pinned?
removed the APT_LLVM_V
All of those need a tight choice of the clang version, so they must keep using APT_LLVM_V. They can switch to 26.04 next month, when upstream apt_llvm pushes the update.
Not sure if related, but the test took a long time here: https://github.com/bitcoin/bitcoin/actions/runs/25844158007/job/75948572939?pr=35288#step:11:5692
So maybe this is blocked on #34731 :(
Concept ACK
Concept ACK
Concept ACK.
<!--85328a0da195eb286784d51f73fa0af9-->
🚧 At least one of the CI tasks failed.
<sub>Task iwyu: https://github.com/bitcoin/bitcoin/actions/runs/27257389056/job/80494687653</sub>
<sub>LLM reason (✨ experimental): CI failed because IWYU reported include/header issues (it modified files and the diff check failed, triggering the “Failure generated from IWYU” step).</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>
ACK fa34b37e31fab943faba1766e0b9837b61e17b91.
The commit message for fabefc0f4347163480e16eb2a9ce7d73898a6dd7 states:
Their clang version is pinned, so the only relevant change should be a more recent cmake.
However, this seems to contradict fa34b37e31fab943faba1766e0b9837b61e17b91, which notes:
... the C++ std-lib was bumped...
Their clang version is pinned, so the only relevant change should be a
more recent cmake, more recent C++ stdlib, and more recent Python
version.
Now that the C++ std-lib was bumped in the CI task in the prior commit,
some unused includes can (and must) be dropped.
6 | @@ -7,7 +7,7 @@ 7 | export LC_ALL=C.UTF-8 8 | 9 | export CONTAINER_NAME=ci_freebsd_cross 10 | -export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04" 11 | +export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
thx, edited pull title
code review ACK fab52281f72801f8b99eb9aa5e5fbfe2a80a9a7d
re-ACK fab52281f72801f8b99eb9aa5e5fbfe2a80a9a7d.