Skip to content

fix(rust): bake and use only the designated LLVM version - #529

Merged
catinspace-au merged 2 commits into
mainfrom
fix/llvm-23-only
Oct 6, 2026
Merged

catinspace-au merged 2 commits into
mainfrom
fix/llvm-23-only

Conversation

@catinspace-au

Copy link
Copy Markdown
Contributor

Closes #519.

The ARC runner image bakes one LLVM major, the llvm default in versions.yaml (23), instead of 19-23. The extra majors existed only for the retired ClickHouse C++ fork.

  • toolchains/llvm.yaml is one entry via a new ${HYPERCI_LLVM_DEFAULT} placeholder. A project's build.rust.llvm_version or HYPERCI_LLVM_VERSION doesn't change what the image bakes, though native-deps groups in the same install-all still follow the designated major.
  • The libc++/lldb on-demand entry is gone.
  • New llvm-clang native-deps group installs clang-NN at job time, but only for repos whose .cargo/config.toml links through clang. Every other Rust job is unchanged, so hosted runners don't pick up a new apt.llvm.org dependency or a different libclang.
  • PGO builds now shim clang/clang++ to the designated major, next to the existing ld.lld shim. A clang that falls back to another major links with its own major's lld, and the warning says so.
  • A missing runtimes.llvm key is a clean error rather than a traceback.
  • windows/amd64 is out of the Go default targets and the all shortcut. The explicit windows shortcut stays.
  • Docs: rust-llvm.md, runner-image.md (now matches the real arc-runner-native image), runners.md (C++ wording gone).

No hyperi-infra Dockerfile change is needed. hyperi-infra#310 already points the alternatives at runtime_version('llvm').

Evidence: hyperi-ci check clean, 5479 tests passing. Reviewed by an adversarial pass with no P1, and every P2/P3 finding is fixed in this commit. Not done yet: a fixture rehearsal, and an image rebuild with this release.

toolchains/llvm.yaml now bakes one LLVM major, versions.yaml `llvm`, through a new ${HYPERCI_LLVM_DEFAULT} placeholder. The 19-22 entries and the libc++/lldb install-on-demand entry are gone. They existed only for the ClickHouse fork's C++ build, which is no longer built. HYPERCI_LLVM_VERSION and build.rust.llvm_version do not reach toolchains/llvm.yaml, so the baked toolchain and the image's clang and ld.lld alternatives always name the same major. The native-deps entries in the same install-all run still follow the designated major. default_llvm_major() raises LLVMVersionError for a missing runtimes.llvm, so a bad versions.yaml fails the install with an error line, not a KeyError traceback.

native-deps/rust.yaml installs clang-NN at the designated major from apt.llvm.org, only for a repo whose .cargo/config.toml links through clang. Every other Rust job skips the apt.llvm.org fetch and the libclang1-NN that comes with it. A PGO build shims clang and clang++ to the designated major the way it shims ld.lld. The clang shim is separate, so a runner without clang-NN leaves ld.lld on PATH at the designated major. The clang it falls back to links with its own major's lld, and the warning names that major.

The Go default targets and the `all` shortcut drop windows/amd64. The explicit `windows` shortcut stays.

rust-llvm.md, runner-image.md, runners.md and the Rust troubleshooting, tier 2 and release verification docs describe the single baked major, the clang shim and the arc-runner-native bake, and drop the C++ runner text.

Closes #519
Both are C/C++ editor and analysis tools. No Rust build, link, PGO or BOLT step uses them.
@catinspace-au
catinspace-au merged commit 7079e6c into main Oct 6, 2026
13 checks passed
@catinspace-au
catinspace-au deleted the fix/llvm-23-only branch October 6, 2026 22:29
@github-actions

github-actions Bot commented Oct 6, 2026

Copy link
Copy Markdown
Contributor

Released in v2.12.17 -- https://github.com/hyperi-io/hyperi-ci/releases/tag/v2.12.17

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

LLVM: one config-driven default, image bakes only it; unlink C++ and Windows (after DFE 2.2 GA)

1 participant