Skip to content

Commit

Permalink
emit old upstream warning no matter the build step
Browse files Browse the repository at this point in the history
  • Loading branch information
lolbinarycat committed Aug 27, 2024
1 parent 94e9c4c commit cea707d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 1 addition & 3 deletions src/bootstrap/src/core/build_steps/format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::sync::mpsc::SyncSender;
use std::sync::Mutex;

use build_helper::ci::CiEnv;
use build_helper::git::{get_git_modified_files, warn_old_master_branch};
use build_helper::git::get_git_modified_files;
use ignore::WalkBuilder;

use crate::core::builder::Builder;
Expand Down Expand Up @@ -93,8 +93,6 @@ fn get_modified_rs_files(build: &Builder<'_>) -> Result<Option<Vec<String>>, Str
if !verify_rustfmt_version(build) {
return Ok(None);
}
warn_old_master_branch(&build.config.git_config(), &build.config.src)
.map_err(|e| e.to_string())?;
get_git_modified_files(&build.config.git_config(), Some(&build.config.src), &["rs"])
}

Expand Down
6 changes: 6 additions & 0 deletions src/bootstrap/src/core/sanity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ use std::ffi::{OsStr, OsString};
use std::path::PathBuf;
use std::{env, fs};

use build_helper::git::warn_old_master_branch;

#[cfg(not(feature = "bootstrap-self-test"))]
use crate::builder::Builder;
use crate::builder::Kind;
Expand Down Expand Up @@ -379,4 +381,8 @@ $ pacman -R cmake && pacman -S mingw-w64-x86_64-cmake
if let Some(ref s) = build.config.ccache {
cmd_finder.must_have(s);
}

warn_old_master_branch(&build.config.git_config(), &build.config.src)
.map_err(|e| e.to_string())
.unwrap();
}

0 comments on commit cea707d

Please sign in to comment.