Use workspace keys in Cargo.toml

This commit is contained in:
Luke Street 2024-09-10 23:19:19 -06:00
parent d2b8135cdb
commit 6f3052e05d
6 changed files with 41 additions and 29 deletions

View File

@ -11,6 +11,7 @@ on:
env:
BUILD_PROFILE: release-lto
CARGO_TARGET_DIR: target
CARGO_INCREMENTAL: 0
jobs:
check:
@ -18,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
toolchain: [ stable, 1.73.0, nightly ]
toolchain: [ stable, 1.74.0, nightly ]
fail-fast: false
env:
RUSTFLAGS: -D warnings
@ -179,14 +180,12 @@ jobs:
set -eou pipefail
tag='${{github.ref}}'
tag="${tag#refs/tags/}"
for file in */Cargo.toml; do
version=$(grep '^version' $file | head -1 | awk -F' = ' '{print $2}' | tr -d '"')
version=$(grep '^version' Cargo.toml | head -1 | awk -F' = ' '{print $2}' | tr -d '"')
version="v$version"
if [ "$tag" != "$version" ]; then
echo "::error::Git tag doesn't match the Cargo version! ($tag != $version)"
exit 1
fi
done
- name: Download artifacts
uses: actions/download-artifact@v4
with:
@ -217,3 +216,5 @@ jobs:
uses: softprops/action-gh-release@v2
with:
files: out/*
draft: true
generate_release_notes: true

4
Cargo.lock generated
View File

@ -428,7 +428,7 @@ dependencies = [
[[package]]
name = "nod"
version = "1.2.1"
version = "1.3.0"
dependencies = [
"adler",
"aes",
@ -451,7 +451,7 @@ dependencies = [
[[package]]
name = "nodtool"
version = "1.2.1"
version = "1.3.0"
dependencies = [
"argp",
"base16ct",

View File

@ -6,3 +6,13 @@ resolver = "2"
inherits = "release"
lto = "fat"
strip = "debuginfo"
codegen-units = 1
[workspace.package]
version = "1.3.0"
edition = "2021"
rust-version = "1.74"
authors = ["Luke Street <luke@street.dev>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/encounter/nod-rs"
keywords = ["gamecube", "wii", "iso", "wbfs", "rvz"]

View File

@ -14,6 +14,7 @@ Originally based on the C++ library [nod](https://github.com/AxioDL/nod),
but does not currently support authoring.
Currently supported file formats:
- ISO (GCM)
- WIA / RVZ
- WBFS (+ NKit 2 lossless)
@ -121,8 +122,8 @@ std::io::copy(&mut disc, &mut out)
Licensed under either of
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
- Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
- MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
at your option.

View File

@ -1,17 +1,17 @@
[package]
name = "nod"
version = "1.2.1"
edition = "2021"
rust-version = "1.73.0"
authors = ["Luke Street <luke@street.dev>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/encounter/nod-rs"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
authors.workspace = true
license.workspace = true
repository.workspace = true
documentation = "https://docs.rs/nod"
readme = "../README.md"
description = """
Library for reading GameCube and Wii disc images.
"""
keywords = ["gamecube", "wii", "iso", "wbfs", "rvz"]
keywords.workspace = true
categories = ["command-line-utilities", "parser-implementations"]
[features]

View File

@ -1,17 +1,17 @@
[package]
name = "nodtool"
version = "1.2.1"
edition = "2021"
rust-version = "1.73.0"
authors = ["Luke Street <luke@street.dev>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/encounter/nod-rs"
documentation = "https://docs.rs/nod"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
authors.workspace = true
license.workspace = true
repository.workspace = true
documentation = "https://docs.rs/nodtool"
readme = "../README.md"
description = """
CLI tool for verifying and converting GameCube and Wii disc images.
"""
keywords = ["gamecube", "wii", "iso", "wbfs", "rvz"]
keywords.workspace = true
categories = ["command-line-utilities", "parser-implementations"]
build = "build.rs"