From 3b4883ffae00afc0847ba6dce7fc65ee492b1d4d Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Sat, 16 May 2026 00:00:05 +0200 Subject: [PATCH 1/2] Update cargo submodule --- src/tools/cargo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/cargo b/src/tools/cargo index 9fb171546a9db..bfa14ef47afbd 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit 9fb171546a9db5513062de20df78116ed5ee7668 +Subproject commit bfa14ef47afbddd88d6be1913a0e486386a566a2 From 392f8c0d362f5720ed691c1e3a60931e8a0bbc99 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Sat, 16 May 2026 06:53:31 -0700 Subject: [PATCH 2/2] Remove broken dilos apt repo CI is currently down because apt is unable to access the repo at dilos.org. It is failing inside the fortanix install script which tries to run apt-get with the error: ``` 5.679 E: Failed to fetch https://apt.dilos.org/dilos/dists/dilos2/InRelease 403 Forbidden [IP: 116.202.240.188 443] ``` These lines in the Dockerfile were added when Solaris builds were merged into dist-various-2 in https://github.com/rust-lang/rust/pull/45001. However, Solaris builds were split off in https://github.com/rust-lang/rust/pull/138699. In that PR, these lines adding the dilos repository weren't removed. AFAICT, these are no longer necessary. --- src/ci/docker/host-x86_64/dist-various-2/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ci/docker/host-x86_64/dist-various-2/Dockerfile b/src/ci/docker/host-x86_64/dist-various-2/Dockerfile index 13d76c001a2f7..7473ea194681b 100644 --- a/src/ci/docker/host-x86_64/dist-various-2/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-various-2/Dockerfile @@ -27,9 +27,6 @@ RUN apt-get update && apt-get build-dep -y clang llvm && apt-get install -y --no g++-9-arm-linux-gnueabi \ g++-11-riscv64-linux-gnu -RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486 -RUN add-apt-repository -y 'deb https://apt.dilos.org/dilos dilos2 main' - ENV \ AR_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-ar \ CC_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-clang \