mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check stage0, channel and version files for CI rustc

Browse source 
These files have important role for compiler builds, so include them
in the "if-unchanged" rustc logic.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
onur-ozkan 2024-10-13 17:00:41 +03:00 • committed by Josh Stone
parent 734481cbdc
commit 6e6cbdd2df
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/bootstrap/src/core/config/config.rs
View file

@ -2748,13 +2748,18 @@ impl Config {
} }
}; };
// Look for a version to compare to based on the current commit. let files_to_track = &[
// Only commits merged by bors will have CI artifacts.
let commit = get_closest_merge_commit(Some(&self.src), &self.git_config(), &[
self.src.join("compiler"), self.src.join("compiler"),
self.src.join("library"), self.src.join("library"),
]) self.src.join("src/version"),
.unwrap(); self.src.join("src/stage0"),
self.src.join("src/ci/channel"),
];
// Look for a version to compare to based on the current commit.
// Only commits merged by bors will have CI artifacts.
let commit =
get_closest_merge_commit(Some(&self.src), &self.git_config(), files_to_track).unwrap();
if commit.is_empty() { if commit.is_empty() {
println!("ERROR: could not find commit hash for downloading rustc"); println!("ERROR: could not find commit hash for downloading rustc");
println!("HELP: maybe your repository history is too shallow?"); println!("HELP: maybe your repository history is too shallow?");
@ -2780,7 +2785,7 @@ impl Config {
let has_changes = !t!(helpers::git(Some(&self.src)) let has_changes = !t!(helpers::git(Some(&self.src))
.args(["diff-index", "--quiet", &commit]) .args(["diff-index", "--quiet", &commit])
.arg("--") .arg("--")
.args([self.src.join("compiler"), self.src.join("library")]) .args(files_to_track)
.as_command_mut() .as_command_mut()
.status()) .status())
.success(); .success();