Skip to content

Commit 19ed30b

Browse files
Fix Cargo tagging & version parsing
This modifies the code to correctly load the split cargo version into "current_cargo_version" and the split rustc version. This should fix our Cargo tagging support.
1 parent fb8c06a commit 19ed30b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/main.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,12 +309,12 @@ impl Context {
309309

310310
let current = self.load_version(|filename| filename.starts_with("rustc-"))?;
311311
println!("current version: {}", current);
312-
let current_version = current.split(' ').next().unwrap();
313-
self.current_version = Some(current_version.to_string());
312+
let current_rustc = current.split(' ').next().unwrap();
313+
self.current_version = Some(current_rustc.to_string());
314314

315315
let current_cargo = self.load_version(|filename| filename.starts_with("cargo-"))?;
316316
println!("current cargo version: {}", current_cargo);
317-
let current_version = current_cargo.split(' ').next().unwrap();
317+
let current_cargo = current_cargo.split(' ').next().unwrap();
318318
self.current_cargo_version = Some(current_cargo.to_string());
319319

320320
// The release process for beta looks like so:
@@ -336,7 +336,7 @@ impl Context {
336336
);
337337
}
338338

339-
Ok(prev_version == current_version)
339+
Ok(prev_version == current_rustc)
340340
}
341341

342342
/// Make sure this release comes with a minimum of components.

0 commit comments

Comments
 (0)