Skip to content

Commit

Permalink
check stage0, channel and version files for CI rustc
Browse files Browse the repository at this point in the history
These files have important role for compiler builds, so include them
in the "if-unchanged" rustc logic.

Signed-off-by: onur-ozkan <[email protected]>
  • Loading branch information
onur-ozkan authored and cuviper committed Oct 13, 2024
1 parent 734481c commit 6e6cbdd
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions src/bootstrap/src/core/config/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2748,13 +2748,18 @@ impl Config {
}
};

// 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(), &[
let files_to_track = &[
self.src.join("compiler"),
self.src.join("library"),
])
.unwrap();
self.src.join("src/version"),
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() {
println!("ERROR: could not find commit hash for downloading rustc");
println!("HELP: maybe your repository history is too shallow?");
Expand All @@ -2780,7 +2785,7 @@ impl Config {
let has_changes = !t!(helpers::git(Some(&self.src))
.args(["diff-index", "--quiet", &commit])
.arg("--")
.args([self.src.join("compiler"), self.src.join("library")])
.args(files_to_track)
.as_command_mut()
.status())
.success();
Expand Down

0 comments on commit 6e6cbdd

Please sign in to comment.