From b46a013e539ce65f417d0a41822fbfd2ee89ea83 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Thu, 16 Apr 2026 00:10:44 +0000 Subject: [PATCH 1/2] Fix test compiling Fuchsia with rust-under-test The rust tests were disabled some time ago when fuchsia.googlesource.com was temporarily rate limiting git checkout requests during a high period of requests. This makes a number of attempts to avoid this issue: * It checks out Fuchsia with git filter `tree:0` to reduce download size. * It blocks downloading Fuchsia's Rust toolchain. * It adds a number of retries to requests. * It reduces the parallel git checkout threads. Since it has been a while since we updated the Fuchsia integration, it also updates: * Use the most recent commit [be532c]. * It updates to the clang commit [5e63f2]. * It updates to the Fuchsia SDK version 33.20260909.5.1. * It updates the ubuntu container to 26.04. * It renames the test job to `test-x86_64-fuchsia`. * The Fuchsia build system now requires shared libraries to be stripped. try-job: dist-various-2 try-job: test-x86_64-fuchsia [be532c]: https://fuchsia.googlesource.com/integration/+/be532c365aa6ba56b08ed684c0f8bb71960c18fd [5e63f2]: https://github.com/llvm/llvm-project/commit/5e63f2ce42db2c42f1d0012a3b5fa9c6113f750a --- src/tests/ecosystem-test-jobs/fuchsia.md | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/tests/ecosystem-test-jobs/fuchsia.md b/src/tests/ecosystem-test-jobs/fuchsia.md index 75cf782a77..3f274464c6 100644 --- a/src/tests/ecosystem-test-jobs/fuchsia.md +++ b/src/tests/ecosystem-test-jobs/fuchsia.md @@ -19,7 +19,11 @@ is merged. If you are worried that a pull request might break the Fuchsia builder and want to test it out before submitting it to the bors queue, simply ask bors to run -the try job that builds the Fuchsia integration: `@bors try jobs=x86_64-fuchsia`. +the try job that builds the Fuchsia integration: + +```text +@bors try jobs=test-x86_64-fuchsia +``` ## Building Fuchsia locally @@ -33,24 +37,24 @@ simply run this command from your Rust checkout to download and build Fuchsia using your local Rust toolchain. ``` -src/ci/docker/run.sh x86_64-fuchsia +src/ci/docker/run.sh test-x86_64-fuchsia ``` See the [Testing with Docker](../docker.md) chapter for more details on how to run and debug jobs with Docker. Note that a Fuchsia checkout is *large* – as of this writing, a checkout and -build takes 46G of space – and as you might imagine, it takes a while to +build takes over 67G of space – and as you might imagine, it takes a while to complete. ### Modifying the Fuchsia checkout The main reason you would want to build Fuchsia locally is because you need to investigate a regression. After running a Docker build, you'll find the Fuchsia -checkout inside the `obj/fuchsia` directory of your Rust checkout. If you -modify the `KEEP_CHECKOUT` line in the [build-fuchsia.sh] script to -`KEEP_CHECKOUT=1`, you can change the checkout as needed and rerun the build -command above. This will reuse all the build results from before. +checkout inside the `obj/test-x86_64-fuchsia/fuchsia` directory of your Rust +checkout. If you modify the `KEEP_CHECKOUT` line in the [build-fuchsia.sh] +script to `KEEP_CHECKOUT=1`, you can change the checkout as needed and rerun +the build command above. This will reuse all the build results from before. You can find more options to customize the Fuchsia checkout in the [build-fuchsia.sh] script. @@ -158,8 +162,8 @@ rustc book][platform-support]. [regressions]: https://gist.github.com/tmandry/7103eba4bd6a6fb0c439b5a90ae355fa [build-toolchain]: https://fuchsia.dev/fuchsia-src/development/build/rust_toolchain -[build-fuchsia.sh]: https://github.com/rust-lang/rust/blob/221e2741c39515a5de6da42d8c76ee1e132c2c74/src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh -[build_fuchsia_from_rust_ci.sh]: https://cs.opensource.google/fuchsia/fuchsia/+/main:scripts/rust/build_fuchsia_from_rust_ci.sh?q=build_fuchsia_from_rust_ci&ss=fuchsia +[build-fuchsia.sh]: https://github.com/rust-lang/rust/blob/main/src/ci/docker/host-x86_64/test-x86_64-fuchsia/build-fuchsia.sh +[build_fuchsia_from_rust_ci.sh]: https://cs.opensource.google/fuchsia/fuchsia/+/main:scripts/rust/build_fuchsia_from_rust_ci.sh [platform-support]: https://doc.rust-lang.org/nightly/rustc/platform-support/fuchsia.html [GN]: https://gn.googlesource.com/gn/+/main#gn [Ninja]: https://ninja-build.org/ From 74aadbdde57725286bbae2965d9cbf7cac5089e4 Mon Sep 17 00:00:00 2001 From: The rustc-josh-sync Cronjob Bot Date: Fri, 18 Sep 2026 17:49:10 +0000 Subject: [PATCH 2/2] Prepare for merging from rust-lang/rust This updates the rust-version file to 420ed2a0c3d7225b1744266fd884d431b4d8cfe0. --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index 7c357c0e50..1c3d6e0224 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -c999cef531ea9059e189e82fe0e82c5daf249bc9 +420ed2a0c3d7225b1744266fd884d431b4d8cfe0