Skip to content

Commit

Permalink
build: use workspace table
Browse files Browse the repository at this point in the history
  • Loading branch information
mrcjkb committed Oct 31, 2023
1 parent 03cc377 commit ea9b968
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 54 deletions.
7 changes: 1 addition & 6 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 2 additions & 2 deletions Cargo.lock

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

8 changes: 8 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,11 @@ members = [
exclude = [
"tailor_gui",
]

[workspace.package]
version = "0.2.3"
rust-version = "1.72.0"
authors = ["Aaron Erhardt <[email protected]>"]
edition = "2021"
license = "GPL-2.0+"
repository = "https://github.com/AaronErhardt/tuxedo-rs"
2 changes: 1 addition & 1 deletion nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
Expand Down
17 changes: 1 addition & 16 deletions release-please-config.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
11 changes: 6 additions & 5 deletions tailor_api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[package]
name = "tailor_api"
authors = ["Aaron Erhardt <[email protected]>"]
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"
Expand Down
10 changes: 6 additions & 4 deletions tailor_cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
[package]
name = "tailor"
version = "0.2.3"
description = "Tailor CLI (part of tuxedo-rs)"
authors = [
"Aaron Erhardt <[email protected]>",
"Marc Jakobi <[email protected]>"
]
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" }
Expand Down
11 changes: 6 additions & 5 deletions tailor_client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[package]
name = "tailor_client"
authors = ["Aaron Erhardt <[email protected]>"]
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"
Expand Down
11 changes: 6 additions & 5 deletions tailord/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[package]
name = "tailord"
authors = ["Aaron Erhardt <[email protected]>"]
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"
Expand Down
11 changes: 6 additions & 5 deletions tuxedo_ioctl/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[package]
name = "tuxedo_ioctl"
authors = ["Aaron Erhardt <[email protected]>"]
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"] }
Expand Down
11 changes: 6 additions & 5 deletions tuxedo_sysfs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[package]
name = "tuxedo_sysfs"
authors = ["Aaron Erhardt <[email protected]>"]
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"
Expand Down

0 comments on commit ea9b968

Please sign in to comment.