Skip to content

Commit 351e7d4

Browse files
committed
Auto merge of rust-lang#131560 - cuviper:start-1.84, r=<try>
Bump to 1.84 https://forge.rust-lang.org/release/process.html#bump-the-stable-version-number-t-6-days-friday-the-week-before r? ghost try-job: aarch64-apple
2 parents 2aa26d8 + 6e6cbdd commit 351e7d4

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/bootstrap/src/core/config/config.rs

+11-6
Original file line numberDiff line numberDiff line change
@@ -2748,13 +2748,18 @@ impl Config {
27482748
}
27492749
};
27502750

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 = &[
27542752
self.src.join("compiler"),
27552753
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();
27582763
if commit.is_empty() {
27592764
println!("ERROR: could not find commit hash for downloading rustc");
27602765
println!("HELP: maybe your repository history is too shallow?");
@@ -2780,7 +2785,7 @@ impl Config {
27802785
let has_changes = !t!(helpers::git(Some(&self.src))
27812786
.args(["diff-index", "--quiet", &commit])
27822787
.arg("--")
2783-
.args([self.src.join("compiler"), self.src.join("library")])
2788+
.args(files_to_track)
27842789
.as_command_mut()
27852790
.status())
27862791
.success();

src/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.83.0
1+
1.84.0

0 commit comments

Comments
 (0)