From ea9b9683dab5ab18795c2502de99f0b15fbe1772 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Tue, 31 Oct 2023 23:51:24 +0100 Subject: [PATCH] build: use workspace table --- .release-please-manifest.json | 7 +------ Cargo.lock | 4 ++-- Cargo.toml | 8 ++++++++ nix/overlay.nix | 2 +- release-please-config.json | 17 +---------------- tailor_api/Cargo.toml | 11 ++++++----- tailor_cli/Cargo.toml | 10 ++++++---- tailor_client/Cargo.toml | 11 ++++++----- tailord/Cargo.toml | 11 ++++++----- tuxedo_ioctl/Cargo.toml | 11 ++++++----- tuxedo_sysfs/Cargo.toml | 11 ++++++----- 11 files changed, 49 insertions(+), 54 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index b73a2b1..afe3e8b 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,9 +1,4 @@ { - "tuxedo_ioctl": "0.2.3", - "tuxedo_sysfs": "0.2.3", - "tailord": "0.2.3", - "tailor_api": "0.2.3", - "tailor_client": "0.2.3", - "tailor_cli": "0.2.3", + ".": "0.2.3", "tailor_gui": "0.2.3" } diff --git a/Cargo.lock b/Cargo.lock index bdabcda..7c07ef7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1320,7 +1320,7 @@ dependencies = [ [[package]] name = "tailor_client" -version = "0.2.1" +version = "0.2.3" dependencies = [ "serde_json", "tailor_api", @@ -1555,7 +1555,7 @@ dependencies = [ [[package]] name = "tuxedo_sysfs" -version = "0.2.0" +version = "0.2.3" dependencies = [ "futures", "sudo", diff --git a/Cargo.toml b/Cargo.toml index 2ec6384..1a775df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,3 +11,11 @@ members = [ exclude = [ "tailor_gui", ] + +[workspace.package] +version = "0.2.3" +rust-version = "1.72.0" +authors = ["Aaron Erhardt "] +edition = "2021" +license = "GPL-2.0+" +repository = "https://github.com/AaronErhardt/tuxedo-rs" diff --git a/nix/overlay.nix b/nix/overlay.nix index ea5e705..2f4948d 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -12,7 +12,7 @@ tuxedo-rs = pkgs.tuxedo-rs.overrideAttrs (oa: { src = self; - version = ((lib.importTOML "${self}/tailord/Cargo.toml").package).version; + version = ((lib.importTOML "${self}/Cargo.toml").workspace.package).version; cargoDeps = pkgs.rustPlatform.importCargoLock { lockFile = self + "/Cargo.lock"; }; diff --git a/release-please-config.json b/release-please-config.json index 49ed1e9..f3674b6 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -1,22 +1,7 @@ { "plugins": ["cargo-workspace"], "packages": { - "tuxedo_ioctl": { - "release-type": "rust" - }, - "tuxedo_sysfs": { - "release-type": "rust" - }, - "tailord": { - "release-type": "rust" - }, - "tailor_api": { - "release-type": "rust" - }, - "tailor_client": { - "release-type": "rust" - }, - "tailor_cli": { + ".": { "release-type": "rust" }, "tailor_gui": { diff --git a/tailor_api/Cargo.toml b/tailor_api/Cargo.toml index dd18ff0..f39faaf 100644 --- a/tailor_api/Cargo.toml +++ b/tailor_api/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "tailor_api" -authors = ["Aaron Erhardt "] -version = "0.2.3" -edition = "2021" -license = "GPL-2.0+" description = "API types for communication with tailord (part of tuxedo-rs)" -repository = "https://github.com/AaronErhardt/tuxedo-rs" +version.workspace = true +rust-version.workspace = true +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] atoi = "2" diff --git a/tailor_cli/Cargo.toml b/tailor_cli/Cargo.toml index 26324a4..a083925 100644 --- a/tailor_cli/Cargo.toml +++ b/tailor_cli/Cargo.toml @@ -1,14 +1,16 @@ [package] name = "tailor" -version = "0.2.3" +description = "Tailor CLI (part of tuxedo-rs)" authors = [ "Aaron Erhardt ", "Marc Jakobi " ] -edition = "2021" publish = false -description = "Tailor CLI (part of tuxedo-rs)" -repository = "https://github.com/AaronErhardt/tuxedo-rs" +version.workspace = true +rust-version.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] tailor_api = {version = "0.2.1", path = "../tailor_api" } diff --git a/tailor_client/Cargo.toml b/tailor_client/Cargo.toml index 8213ec3..3ab0bc1 100644 --- a/tailor_client/Cargo.toml +++ b/tailor_client/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "tailor_client" -authors = ["Aaron Erhardt "] -version = "0.2.3" -edition = "2021" -license = "GPL-2.0+" description = "Client library for tailord (part of tuxedo-rs)" -repository = "https://github.com/AaronErhardt/tuxedo-rs" +version.workspace = true +rust-version.workspace = true +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] thiserror = "1" diff --git a/tailord/Cargo.toml b/tailord/Cargo.toml index a272d4b..8f3ae18 100644 --- a/tailord/Cargo.toml +++ b/tailord/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "tailord" -authors = ["Aaron Erhardt "] -version = "0.2.3" -edition = "2021" -license = "GPL-2.0+" description = "Daemon handling fan, keyboard and general HW support for Tuxedo laptops (part of tuxedo-rs)" -repository = "https://github.com/AaronErhardt/tuxedo-rs" +version.workspace = true +rust-version.workspace = true +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] futures = "0.3" diff --git a/tuxedo_ioctl/Cargo.toml b/tuxedo_ioctl/Cargo.toml index a7050de..2179baa 100644 --- a/tuxedo_ioctl/Cargo.toml +++ b/tuxedo_ioctl/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "tuxedo_ioctl" -authors = ["Aaron Erhardt "] -version = "0.2.3" -edition = "2021" -license = "GPL-2.0+" description = "Tuxedo ioctl interface (part of tuxedo-rs)" -repository = "https://github.com/AaronErhardt/tuxedo-rs" +version.workspace = true +rust-version.workspace = true +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] nix = { version = "0.26", features = ["ioctl"] } diff --git a/tuxedo_sysfs/Cargo.toml b/tuxedo_sysfs/Cargo.toml index 67a57ec..4863c24 100644 --- a/tuxedo_sysfs/Cargo.toml +++ b/tuxedo_sysfs/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "tuxedo_sysfs" -authors = ["Aaron Erhardt "] -version = "0.2.3" -edition = "2021" -license = "GPL-2.0+" description = "Tuxedo sysfs interface (part of tuxedo-rs)" -repository = "https://github.com/AaronErhardt/tuxedo-rs" +version.workspace = true +rust-version.workspace = true +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] futures = "0.3"