Skip to content

Commit

Permalink
feat: implement workspace inheritance (#506)
Browse files Browse the repository at this point in the history
  • Loading branch information
oddgrd authored Dec 7, 2022
1 parent 3d5c55b commit 8052e87
Show file tree
Hide file tree
Showing 12 changed files with 183 additions and 178 deletions.
8 changes: 6 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ jobs:
- install-protoc
- run: cargo fmt --all --check
- run: cargo install cargo-sort
- run: cargo sort --check --workspace
# TODO: this is incompatible with workspace inheritance, uncomment when
# https://github.com/DevinR528/cargo-sort/pull/29 is merged
# - run: cargo sort --check --workspace
- run: cargo check --workspace --all-targets
- save-cargo-cache
workspace-clippy:
Expand Down Expand Up @@ -176,7 +178,9 @@ jobs:
- apply-patches
- run: cargo fmt --all --check --manifest-path << parameters.path >>/Cargo.toml
- run: cargo install cargo-sort
- run: cargo sort --check << parameters.path >>
# TODO: this is incompatible with workspace inheritance, uncomment when
# https://github.com/DevinR528/cargo-sort/pull/29 is merged
# - run: cargo sort --check << parameters.path >>
- run: |
cargo clippy --tests \
--all-targets \
Expand Down
117 changes: 49 additions & 68 deletions Cargo.lock

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

25 changes: 25 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ members = [
"provisioner",
"service"
]

exclude = [
"e2e",
"examples",
Expand All @@ -19,3 +20,27 @@ exclude = [
"resources/shared-db",
"resources/static-folder"
]

[workspace.package]
version = "0.7.3"
edition = "2021"
license = "Apache-2.0"

# https://doc.rust-lang.org/cargo/reference/workspaces.html#the-workspacedependencies-table
[workspace.dependencies]
shuttle-codegen = { path = "codegen", version = "0.7.2" }
shuttle-common = { path = "common", version = "0.7.3" }
shuttle-proto = { path = "proto", version = "0.7.3" }
shuttle-service = { path = "service", version = "0.7.2" }

anyhow = "1.0.66"
async-trait = "0.1.58"
axum = "0.6.0"
chrono = "0.4.23"
once_cell = "1.16.0"
uuid = "1.2.2"
thiserror = "1.0.37"
serde = "1.0.148"
serde_json = "1.0.89"
tracing = "0.1.37"
tracing-subscriber = "0.3.16"
Loading

0 comments on commit 8052e87

Please sign in to comment.