Skip to content

Commit

Permalink
Auto merge of #131560 - cuviper:start-1.84, r=cuviper
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed Oct 13, 2024
2 parents 3678036 + 6e6cbdd commit 27861c4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 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
2 changes: 1 addition & 1 deletion src/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.83.0
1.84.0

0 comments on commit 27861c4

Please sign in to comment.