Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: workspace inherit fun again #155

Merged
merged 1 commit into from
Jun 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 2 additions & 37 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,12 @@ updates:
- package-ecosystem: "cargo"
directory: "/"
commit-message:
prefix: "[chore(workspace)]"
include: "scope"
target-branch: "main"
schedule:
interval: "weekly"

- package-ecosystem: "cargo"
directory: "/homestar-core"
commit-message:
prefix: "[chore(core)]"
include: "scope"
target-branch: "main"
schedule:
interval: "weekly"

- package-ecosystem: "cargo"
directory: "/homestar-runtime"
commit-message:
prefix: "[chore(runtime)]"
include: "scope"
target-branch: "main"
schedule:
interval: "weekly"

- package-ecosystem: "cargo"
directory: "/homestar-guest-wasm"
commit-message:
prefix: "[chore(guest-wasm)]"
include: "scope"
target-branch: "main"
schedule:
interval: "weekly"

- package-ecosystem: "cargo"
directory: "/homestar-wasm"
commit-message:
prefix: "[chore(wasm)]"
prefix: "[chore(cargo)]"
include: "scope"
target-branch: "main"
schedule:
interval: "weekly"
open-pull-requests-limit: 10

- package-ecosystem: "docker"
directory: "/docker"
Expand Down
6 changes: 6 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ repos:
files: \.nix$
language: system

- repo: https://github.com/DevinR528/cargo-sort
rev: v1.0.9
hooks:
- id: cargo-sort
args: ["-w"]

- repo: https://github.com/compilerla/conventional-pre-commit
rev: v2.1.1
hooks:
Expand Down
24 changes: 13 additions & 11 deletions homestar-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,36 @@ description = "Homestar core library for working with tasks, instructions, etc"
keywords = ["ipld", "tasks", "receipts", "ipvm"]
categories = ["workflow-engines", "core", "libraries"]
include = ["/src", "README.md", "LICENSE"]
license.workspace = true
license = { workspace = true }
readme = "README.md"
edition.workspace = true
rust-version.workspace = true
edition = { workspace = true }
rust-version = { workspace = true }
documentation = "https://docs.rs/homestar-core"
repository = "https://github.com/ipvm-wg/homestar"
authors.workspace = true
authors = { workspace = true }

[lib]
path = "src/lib.rs"
bench = false
doctest = true

[dependencies]
anyhow .workspace = true
byte-unit.workspace = true
# return to version.workspace = true after the following issue is fixed:
# https://github.com/DevinR528/cargo-sort/issues/47
anyhow = { workspace = true }
byte-unit = { workspace = true }
diesel = { version = "2.0", features = ["sqlite"] }
enum-as-inner.workspace = true
enum-assoc.workspace = true
enum-as-inner = { workspace = true }
enum-assoc = { workspace = true }
generic-array = { version = "0.14", features = ["serde"] }
indexmap = "1.9"
libipld.workspace = true
libipld = { workspace = true }
libsqlite3-sys = { version = "0.26", features = ["bundled"] }
proptest = { version = "1.2", optional = true }
serde = { version = "1.0", features = ["derive"] }
signature = "2.0"
thiserror.workspace = true
tracing.workspace = true
thiserror = { workspace = true }
tracing = { workspace = true }
ucan = "0.3"
url = { version = "2.3", features = ["serde"] }
uuid = { version = "1.3", default-features = false, features = ["v4", "fast-rng"] }
Expand Down
4 changes: 2 additions & 2 deletions homestar-guest-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
name = "homestar-guest-wasm"
publish = false
version = "0.1.0"
edition.workspace = true
rust-version.workspace = true
edition = { workspace = true }
rust-version = { workspace = true }

[dependencies]
image = { version = "0.24", default-features = false, features = ["png"] }
Expand Down
24 changes: 13 additions & 11 deletions homestar-runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ description = "Homestar CLI"
keywords = ["ipfs", "workflows", "ipld", "ipvm"]
categories = ["workflow-engines", "distributed-systems", "runtimes", "networking"]
include = ["/src", "README.md", "LICENSE"]
license.workspace = true
license = { workspace = true }
readme = "README.md"
edition.workspace = true
rust-version.workspace = true
edition = { workspace = true }
rust-version = { workspace = true }
documentation = "https://docs.rs/homestar"
repository = "https://github.com/ipvm-wg/homestar"
authors.workspace = true
authors = { workspace = true }

[lib]
path = "src/lib.rs"
Expand All @@ -27,10 +27,12 @@ bench = false

[dependencies]
ansi_term = { version = "0.12", optional = true, default-features = false }
anyhow.workspace = true
# return to version.workspace = true after the following issue is fixed:
# https://github.com/DevinR528/cargo-sort/issues/47
anyhow = { workspace = true }
async-trait = "0.1"
axum = { version = "0.6", features = ["ws", "headers"] }
byte-unit.workspace = true
byte-unit = { workspace = true }
clap = { version = "4.3", features = ["derive", "color", "help"] }
concat-in-place = "1.1"
config = "0.13"
Expand All @@ -39,7 +41,7 @@ crossbeam = "0.8"
dagga = "0.2"
diesel = { version = "2.1", features = ["sqlite", "r2d2", "returning_clauses_for_sqlite_3_35"] }
dotenvy = "0.15"
enum-assoc.workspace = true
enum-assoc = { workspace = true }
futures = "0.3"
headers = "0.3"
homestar-core = { version = "0.1", path = "../homestar-core" }
Expand All @@ -50,18 +52,18 @@ indexmap = "1.9"
ipfs-api = { version = "0.17", optional = true }
ipfs-api-backend-hyper = { version = "0.6", features = ["with-builder", "with-send-sync"], optional = true }
itertools = "0.10"
libipld.workspace = true
libipld = { workspace = true }
libp2p = { version = "0.51", default-features = false, features = ["kad", "request-response", "macros", "identify", "mdns", "gossipsub", "tokio", "dns", "mplex", "tcp", "noise", "yamux", "websocket"] }
libsqlite3-sys = { version = "0.26", features = ["bundled"] }
openssl = { version = "0.10", features = ["vendored"] }
proptest = { version = "1.2", optional = true }
reqwest = { version = "0.11", features = ["json"] }
semver = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_ipld_dagcbor.workspace = true
serde_ipld_dagcbor = { workspace = true }
thiserror = "1.0"
tokio.workspace = true
tracing.workspace = true
tokio = { workspace = true }
tracing = { workspace = true }
tracing-appender = "0.2"
tracing-logfmt = "0.3"
tracing-subscriber = { version = "0.3", features = ["env-filter", "parking_lot", "registry"] }
Expand Down
26 changes: 14 additions & 12 deletions homestar-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,34 @@ description = "Homestar Wasm / Wasmtime implementation and IPLD <=> WIT interpre
keywords = ["wasm", "wasmtime", "wit", "ipld", "ipvm"]
categories = ["wasm", "execution-engines"]
include = ["/src", "README.md", "LICENSE"]
license.workspace = true
license = { workspace = true }
readme = "README.md"
edition.workspace = true
rust-version.workspace = true
edition = { workspace = true }
rust-version = { workspace = true }
documentation = "https://docs.rs/homestar-wasm"
repository = "https://github.com/ipvm-wg/homestar"
authors.workspace = true
authors = { workspace = true }

[lib]
path = "src/lib.rs"
bench = false
doctest = true

[dependencies]
anyhow.workspace = true
async-trait.workspace = true
# return to version.workspace = true after the following issue is fixed:
# https://github.com/DevinR528/cargo-sort/issues/47
anyhow = { workspace = true }
async-trait = { workspace = true }
atomic_refcell = "0.1"
enum-as-inner.workspace = true
enum-as-inner = { workspace = true }
heck = "0.4"
homestar-core = { version = "0.1", path = "../homestar-core" }
itertools = "0.10"
libipld.workspace = true
libipld = { workspace = true }
rust_decimal = "1.30"
stacker = "0.1"
thiserror.workspace = true
tracing.workspace = true
thiserror = { workspace = true }
tracing = { workspace = true }
wasi-common = "8.0"
wasmparser = "0.104"
wasmtime = { version = "8.0", features = ["async", "component-model", "default"] }
Expand All @@ -41,8 +43,8 @@ wit-component = "0.8"
[dev-dependencies]
criterion = "0.5"
image = "0.24"
serde_ipld_dagcbor.workspace = true
tokio.workspace = true
serde_ipld_dagcbor = { workspace = true }
tokio = { workspace = true }

[features]
default = []
Expand Down
Loading