Skip to content

Commit

Permalink
Unrolled build for rust-lang#117533
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#117533 - onur-ozkan:revert-117471, r=onur-ozkan

Revert "bootstrap: do not purge docs on CI environment"

This reverts commit 6198e88.

ref rust-lang#117430 (comment), rust-lang#117471 (comment)
  • Loading branch information
rust-timer authored Nov 3, 2023
2 parents adda05f + fedfca7 commit 72d317a
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions src/bootstrap/src/core/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ 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};

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

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()
{
if cmd == "doc" || cmd == "rustdoc" {
let my_out = match mode {
// This is the intended out directory for compiler documentation.
Mode::Rustc | Mode::ToolRustc => self.compiler_doc_out(target),
Expand Down

0 comments on commit 72d317a

Please sign in to comment.