Auto merge of #131560 - cuviper:start-1.84, r=cuviper · rust-lang/rust@27861c4 (original) (raw)

Original file line number Diff line number Diff line change
@@ -2748,13 +2748,18 @@ impl Config {
2748 2748 }
2749 2749 };
2750 2750
2751 -// Look for a version to compare to based on the current commit.
2752 -// Only commits merged by bors will have CI artifacts.
2753 -let commit = get_closest_merge_commit(Some(&self.src), &self.git_config(), &[
2751 +let files_to_track = &[
2754 2752 self.src.join("compiler"),
2755 2753 self.src.join("library"),
2756 -])
2757 -.unwrap();
2754 +self.src.join("src/version"),
2755 +self.src.join("src/stage0"),
2756 +self.src.join("src/ci/channel"),
2757 +];
2758 +
2759 +// Look for a version to compare to based on the current commit.
2760 +// Only commits merged by bors will have CI artifacts.
2761 +let commit =
2762 +get_closest_merge_commit(Some(&self.src), &self.git_config(), files_to_track).unwrap();
2758 2763 if commit.is_empty() {
2759 2764 println!("ERROR: could not find commit hash for downloading rustc");
2760 2765 println!("HELP: maybe your repository history is too shallow?");
@@ -2780,7 +2785,7 @@ impl Config {
2780 2785 let has_changes = !t!(helpers::git(Some(&self.src))
2781 2786 .args(["diff-index", "--quiet", &commit])
2782 2787 .arg("--")
2783 -.args([self.src.join("compiler"), self.src.join("library")])
2788 +.args(files_to_track)
2784 2789 .as_command_mut()
2785 2790 .status())
2786 2791 .success();