Skip to content

Commit

Permalink
Resolve the workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
StratusFearMe21 committed Nov 27, 2023
1 parent fc446b0 commit 23ea0ca
Show file tree
Hide file tree
Showing 3 changed files with 121 additions and 48 deletions.
159 changes: 116 additions & 43 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo-appimage"
version = "2.1.0"
version = "2.2.0"
authors = [
"Isaac Mills <[email protected]>",
"Jim Hessin <[email protected]>",
Expand All @@ -15,7 +15,7 @@ readme = "README.md"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cargo_toml = "0.11.5"
cargo_toml = "0.17.1"
anyhow = "1.0.56"
platforms = "2.0.0"
fs_extra = "1.2.0"
Expand Down
6 changes: 3 additions & 3 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use anyhow::{bail, Context, Result};
use cargo_toml::{Product, Value};
use cargo_toml::Value;
use fs_extra::dir::CopyOptions;
use std::{
io::{Read, Write},
Expand Down Expand Up @@ -40,7 +40,7 @@ fn main() -> Result<()> {
memmap::Mmap::map(&std::fs::File::open("Cargo.toml")?)?.as_ref()
})
.context("Cannot find Cargo.toml")?;
meta.complete_from_path(Path::new("."))
meta.complete_from_path_and_workspace::<cargo_toml::Value>(Path::new("."), None)
.context("Could not fill in the gaps in Cargo.toml")?;
let pkg = meta
.package
Expand Down Expand Up @@ -284,7 +284,7 @@ fn main() -> Result<()> {
.args(bin_args)
.arg(&format!("{}/appimage/{}.AppImage", &target_prefix, &name))
.env("ARCH", platforms::target::TARGET_ARCH.as_str())
.env("VERSION", pkg.version.as_str())
.env("VERSION", pkg.version())
.status()
.context("Error occurred: make sure that appimagetool is installed")?;
}
Expand Down

0 comments on commit 23ea0ca

Please sign in to comment.