Skip to content
This repository was archived by the owner on Jun 10, 2022. It is now read-only.

Commit 6d5a415

Browse files
committed
Fix local version check in release script
1 parent 0226c6c commit 6d5a415

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "lore-seeker"
3-
version = "0.0.3"
3+
version = "0.2.4"
44
authors = ["Fenhl <fenhl@fenhl.net>"]
55
edition = "2018"
66

src/bin/release.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#![deny(unused, unused_qualifications)]
33
#![forbid(unused_import_braces)]
44

5-
#[macro_use] extern crate wrapped_enum;
6-
75
use std::{
86
cmp::Ordering::*,
97
fs::File,
@@ -13,10 +11,12 @@ use std::{
1311
},
1412
process::Command
1513
};
14+
use itertools::Itertools;
1615
use semver::{
1716
SemVerError,
1817
Version
1918
};
19+
use wrapped_enum::wrapped_enum;
2020
use lore_seeker_desktop::{
2121
github::Repo,
2222
util
@@ -47,13 +47,16 @@ fn main() -> Result<(), Error> {
4747
let repo = Repo::new("fenhl", "lore-seeker-desktop");
4848
let client = util::release_client()?;
4949
let metadata = cargo_metadata::MetadataCommand::default().exec()?;
50-
let local_version = &metadata.packages.first().ok_or(OtherError::MissingPackage)?.version;
50+
let (pkg,) = metadata.packages.into_iter().filter(|pkg| pkg.name == "lore-seeker").collect_tuple().ok_or(OtherError::MissingPackage)?;
51+
let local_version = pkg.version;
5152
let remote_version = repo.latest_release(&client)?.tag_name[1..].parse::<Version>()?;
5253
match local_version.cmp(&remote_version) {
5354
Less => { return Err(OtherError::VersionRegression.into()); }
5455
Equal => { return Err(OtherError::SameVersion.into()); }
5556
Greater => {}
5657
}
58+
if !Command::new("rustup").arg("update").arg("stable").status()?.success() { return Err(OtherError::Command.into()); }
59+
if !Command::new("rustup").arg("update").arg("stable-i686-pc-windows-msvc").status()?.success() { return Err(OtherError::Command.into()); }
5760
if !Command::new("cargo").arg("build").arg("--bin=lore-seeker-desktop").arg("--release").status()?.success() { return Err(OtherError::Command.into()); }
5861
if !Command::new("cargo").arg("+stable-i686-pc-windows-msvc").arg("build").arg("--bin=lore-seeker-desktop").arg("--release").arg("--target-dir=target-x86").status()?.success() { return Err(OtherError::Command.into()); }
5962
let release_notes = {

0 commit comments

Comments
 (0)