diff options
| author | bors <bors@rust-lang.org> | 2024-10-13 20:08:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-13 20:08:57 +0000 |
| commit | 27861c429af736ea3a6bb015956c7286071b286d (patch) | |
| tree | 22066f9d94c67afafde8573b58a67de6c0421df1 | |
| parent | 36780360b62320a61e2234b17ec600e8e4785509 (diff) | |
| parent | 6e6cbdd2df0ae5a025c458d95a4c84df1b6af092 (diff) | |
| download | rust-27861c429af736ea3a6bb015956c7286071b286d.tar.gz rust-27861c429af736ea3a6bb015956c7286071b286d.zip | |
Auto merge of #131560 - cuviper:start-1.84, r=cuviper
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
| -rw-r--r-- | src/bootstrap/src/core/config/config.rs | 17 | ||||
| -rw-r--r-- | src/version | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs index 3f025a198cb..f768470c4ff 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs @@ -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?"); @@ -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(); diff --git a/src/version b/src/version index 6b4de0a42b0..bd0f9e6c28f 100644 --- a/src/version +++ b/src/version @@ -1 +1 @@ -1.83.0 +1.84.0 |