Skip to content

Commit c0fa97c

Browse files
authored
Rollup merge of #117533 - onur-ozkan:revert-117471, r=onur-ozkan
Revert "bootstrap: do not purge docs on CI environment" This reverts commit 6198e88. ref #117430 (comment), #117471 (comment)
2 parents 7a0df44 + fedfca7 commit c0fa97c

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

Diff for: src/bootstrap/src/core/builder.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ pub use crate::Compiler;
2828
// - use std::lazy for `Lazy`
2929
// - use std::cell for `OnceCell`
3030
// Once they get stabilized and reach beta.
31-
use build_helper::ci::CiEnv;
3231
use clap::ValueEnum;
3332
use once_cell::sync::{Lazy, OnceCell};
3433

@@ -1275,12 +1274,7 @@ impl<'a> Builder<'a> {
12751274
self.clear_if_dirty(&out_dir, &backend);
12761275
}
12771276

1278-
if cmd == "doc"
1279-
|| cmd == "rustdoc"
1280-
// FIXME: We shouldn't need to check this.
1281-
// ref https://github.com/rust-lang/rust/issues/117430#issuecomment-1788160523
1282-
&& !CiEnv::is_ci()
1283-
{
1277+
if cmd == "doc" || cmd == "rustdoc" {
12841278
let my_out = match mode {
12851279
// This is the intended out directory for compiler documentation.
12861280
Mode::Rustc | Mode::ToolRustc => self.compiler_doc_out(target),

0 commit comments

Comments
 (0)