rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-01-30 20:05:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #469 from hendrikmaus/release-operator-crates-io-publishing-detect-newer-version-in-the-registry

Browse Source 
Determine if the current crate is ahead or behind the registry
This commit is contained in:
Hanno Braun 2022-04-13 11:32:47 +02:00 committed by GitHub
commit ae1477dc6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release-operator/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "release-operator" name = "release-operator"
version = "0.2.0" version = "0.3.0"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

23
release-operator/src/registry.rs
View File

@ -17,9 +17,14 @@ pub struct Crate {
} }
enum CrateState { enum CrateState {
/// Our crate version is ahead of the registry and should be published
Ahead,
/// Our crate version is behind the registry; you'll be warned about this
Behind,
/// Our crate version matches the registry version
Published, Published,
/// We encountered an unknown state while processing the crate
Unknown, Unknown,
Outdated,
} }
impl Registry { impl Registry {
@ -36,8 +41,8 @@ impl Registry {
c.validate()?; c.validate()?;
match c.determine_state()? { match c.determine_state()? {
CrateState::Published => continue, CrateState::Published | CrateState::Behind => continue,
CrateState::Unknown | CrateState::Outdated => { CrateState::Unknown | CrateState::Ahead => {
c.submit(&self.token, self.dry_run)?; c.submit(&self.token, self.dry_run)?;
} }
} }
@ -72,7 +77,8 @@ impl Crate {
.context("search crates.io for published crate version")?; .context("search crates.io for published crate version")?;
log::debug!("{self} found as {version} on their side"); log::debug!("{self} found as {version} on their side");
version semver::Version::from_str(&version)
.context("parse their version")?
}; };
let ours = { let ours = {
@ -93,7 +99,7 @@ impl Crate {
.find(|p| p.name == name) .find(|p| p.name == name)
.ok_or_else(|| anyhow!("could not find package"))?; .ok_or_else(|| anyhow!("could not find package"))?;
let version = package.version.to_string(); let version = package.version.to_owned();
log::debug!("{self} found as {version} on our side"); log::debug!("{self} found as {version} on our side");
version version
@ -104,7 +110,12 @@ impl Crate {
return Ok(CrateState::Published); return Ok(CrateState::Published);
} }
Ok(CrateState::Outdated) if ours < theirs {
log::warn!("{self} has already been published as {ours}, which is a newer version");
return Ok(CrateState::Behind);
}
Ok(CrateState::Ahead)
} }
fn submit(&self, token: &SecStr, dry_run: bool) -> anyhow::Result<()> { fn submit(&self, token: &SecStr, dry_run: bool) -> anyhow::Result<()> {