Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Cargo tagging & version parsing #76

Merged
merged 1 commit into from
Oct 9, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -309,12 +309,12 @@ impl Context {

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

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

// The release process for beta looks like so:
Expand All @@ -336,7 +336,7 @@ impl Context {
);
}

Ok(prev_version == current_version)
Ok(prev_version == current_rustc)
}

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