Skip to content

base-builder-rust: bump RUSTUP_TOOLCHAIN to nightly-2025-09-05 on ubuntu-24-04#15461

Open
masumi-ryugo wants to merge 1 commit into
google:masterfrom
masumi-ryugo:fix/rust-toolchain-ubuntu-24-04
Open

base-builder-rust: bump RUSTUP_TOOLCHAIN to nightly-2025-09-05 on ubuntu-24-04#15461
masumi-ryugo wants to merge 1 commit into
google:masterfrom
masumi-ryugo:fix/rust-toolchain-ubuntu-24-04

Conversation

@masumi-ryugo
Copy link
Copy Markdown

Fixes #14220.

The default base-builder-rust Dockerfile was bumped to nightly-2025-09-05 in 625f70d, but the ubuntu-24-04 variant was left at nightly-2024-07-12. As reported in #14220, this causes build failures / coverage mismatches when projects opt into the ubuntu-24-04 image (currently 360 projects).

This PR aligns ubuntu-24-04.Dockerfile with the default Dockerfile (1-line change).

Why it's safe to bump now

The original concern raised on #13964 was that RUSTUP_TOOLCHAIN couldn't be bumped on the new images while LLVM was at a different revision. As of master, OUR_LLVM_REVISION=cb2f0d0a5f14 is identical across all three base-clang scripts:

infra/base-images/base-clang/checkout_build_install_llvm.sh:OUR_LLVM_REVISION=cb2f0d0a5f14
infra/base-images/base-clang/checkout_build_install_llvm_ubuntu_20_04.sh:OUR_LLVM_REVISION=cb2f0d0a5f14
infra/base-images/base-clang/checkout_build_install_llvm_ubuntu_24_04.sh:OUR_LLVM_REVISION=cb2f0d0a5f14

So the toolchain/LLVM compatibility concern that delayed this no longer applies — nightly-2025-09-05 already runs successfully against this LLVM revision in the default image.

Scope

  • Only ubuntu-24-04.Dockerfile is touched (the file the issue is about).
  • ubuntu-20-04.Dockerfile is also at nightly-2024-07-12 but Ubuntu 20.04 reached EOL in April 2025; whether to bump or remove that file is a separate decision and is intentionally out of scope here.

@google-cla
Copy link
Copy Markdown

google-cla Bot commented May 5, 2026

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@masumi-ryugo
Copy link
Copy Markdown
Author

@googlebot I signed it!

…ntu-24-04

The default base-builder-rust Dockerfile was bumped to nightly-2025-09-05
in 625f70d, but the ubuntu-24-04 variant
was left at the older nightly-2024-07-12, causing build failures and
coverage mismatches when projects opt into ubuntu-24-04 (google#14220).

The LLVM revision (cb2f0d0a5f14) is now identical across the default,
ubuntu-20-04 and ubuntu-24-04 base-clang scripts, so the toolchain/LLVM
compatibility concern that originally delayed this bump no longer
applies.

Fixes: google#14220
@masumi-ryugo masumi-ryugo force-pushed the fix/rust-toolchain-ubuntu-24-04 branch from d8cc125 to a388a6a Compare May 5, 2026 11:44
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.

RUSTUP_TOOLCHAIN in base-builder-rust:ubuntu-24-04 is older than in base-builder-rust

1 participant