From 6f3052e05d07590172fd255ab11d9e78f2b1aa7f Mon Sep 17 00:00:00 2001
From: Luke Street <luke@street.dev>
Date: Tue, 10 Sep 2024 23:19:19 -0600
Subject: [PATCH] Use workspace keys in Cargo.toml

---
 .github/workflows/build.yaml | 19 ++++++++++---------
 Cargo.lock                   |  4 ++--
 Cargo.toml                   | 10 ++++++++++
 README.md                    |  7 ++++---
 nod/Cargo.toml               | 14 +++++++-------
 nodtool/Cargo.toml           | 16 ++++++++--------
 6 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 17de80c..8ade63c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -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="v$version"
-            if [ "$tag" != "$version" ]; then
-              echo "::error::Git tag doesn't match the Cargo version! ($tag != $version)"
-              exit 1
-            fi
-          done
+          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
       - 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
diff --git a/Cargo.lock b/Cargo.lock
index 07e3ba9..7b41ef8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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",
diff --git a/Cargo.toml b/Cargo.toml
index b69c4ca..f7c7e2c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"]
diff --git a/README.md b/README.md
index 4d5f36b..11cc41d 100644
--- a/README.md
+++ b/README.md
@@ -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)
@@ -61,7 +62,7 @@ Converts any supported format to raw ISO.
 
 ```shell
 nodtool convert /path/to/game.wia /path/to/game.iso
-``` 
+```
 
 ### verify
 
@@ -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.
 
diff --git a/nod/Cargo.toml b/nod/Cargo.toml
index 54248fc..6120e7a 100644
--- a/nod/Cargo.toml
+++ b/nod/Cargo.toml
@@ -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]
diff --git a/nodtool/Cargo.toml b/nodtool/Cargo.toml
index c0bba73..ff83d4f 100644
--- a/nodtool/Cargo.toml
+++ b/nodtool/Cargo.toml
@@ -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"