mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emit old upstream warning no matter the build step

Browse Source
This commit is contained in:
binarycat 2024-08-27 16:31:40 -04:00
parent 94e9c4cd64
commit cea707d960
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/src/core/build_steps/format.rs
View File

@ -7,7 +7,7 @@
use std::sync::Mutex; use std::sync::Mutex;
use build_helper::ci::CiEnv; 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 ignore::WalkBuilder;
use crate::core::builder::Builder; use crate::core::builder::Builder;
@ -93,8 +93,6 @@ fn get_modified_rs_files(build: &Builder<'_>) -> Result<Option<Vec<String>>, Str
if !verify_rustfmt_version(build) { if !verify_rustfmt_version(build) {
return Ok(None); 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"]) get_git_modified_files(&build.config.git_config(), Some(&build.config.src), &["rs"])
} }

6
src/bootstrap/src/core/sanity.rs
View File

@ -15,6 +15,8 @@
use std::path::PathBuf; use std::path::PathBuf;
use std::{env, fs}; use std::{env, fs};
use build_helper::git::warn_old_master_branch;
#[cfg(not(feature = "bootstrap-self-test"))] #[cfg(not(feature = "bootstrap-self-test"))]
use crate::builder::Builder; use crate::builder::Builder;
use crate::builder::Kind; use crate::builder::Kind;
@ -379,4 +381,8 @@ pub fn check(build: &mut Build) {
if let Some(ref s) = build.config.ccache { if let Some(ref s) = build.config.ccache {
cmd_finder.must_have(s); cmd_finder.must_have(s);
} }
warn_old_master_branch(&build.config.git_config(), &build.config.src)
.map_err(|e| e.to_string())
.unwrap();
} }