From 6198e881d363730900b7b0d4fa8311b3844421a7 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Wed, 1 Nov 2023 02:14:10 +0300 Subject: [PATCH] bootstrap: do not purge docs on CI environment Temporary fix for https://github.com/rust-lang/rust/issues/117430 Signed-off-by: onur-ozkan --- src/bootstrap/src/core/builder.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs index 90e09d12a9d50..2903bcfa1ec9e 100644 --- a/src/bootstrap/src/core/builder.rs +++ b/src/bootstrap/src/core/builder.rs @@ -28,6 +28,7 @@ pub use crate::Compiler; // - use std::lazy for `Lazy` // - use std::cell for `OnceCell` // Once they get stabilized and reach beta. +use build_helper::ci::CiEnv; use clap::ValueEnum; use once_cell::sync::{Lazy, OnceCell}; @@ -1273,7 +1274,12 @@ impl<'a> Builder<'a> { self.clear_if_dirty(&out_dir, &backend); } - if cmd == "doc" || cmd == "rustdoc" { + if cmd == "doc" + || cmd == "rustdoc" + // FIXME: We shouldn't need to check this. + // ref https://github.com/rust-lang/rust/issues/117430#issuecomment-1788160523 + && !CiEnv::is_ci() + { let my_out = match mode { // This is the intended out directory for compiler documentation. Mode::Rustc | Mode::ToolRustc => self.compiler_doc_out(target),