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.

Sign up for GitHub

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

Move the remaining crates to separate workspaces #1122

Merged
merged 1 commit into from
Jun 11, 2020
+3,113 −573
Merged

Move the remaining crates to separate workspaces #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
551 changes: 0 additions & 551 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 2 additions & 12 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
[workspace]
members = [
"oak/server/rust/oak_loader",
"oak/server/rust/oak_runtime",
"runner",
"sdk/rust/oak",
"sdk/rust/oak_tests",
"third_party/roughenough",
]
exclude = ["oak_abi", "oak_utils"]
members = ["oak/server/rust/oak_loader", "oak/server/rust/oak_runtime"]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It feels we should just move this file under oak/server?

Copy link
Contributor Author

@rbehjati rbehjati Jun 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought this change might break too many things and would be better to be done in a separate PR. But I can give it a try here :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are dependency issues... I'll do this in a separate PR.

exclude = ["third_party/expect", "third_party/roughenough"]

# Patch dependencies on oak crates so that they refer to the versions within this same repository.
#
Expand All @@ -16,12 +9,9 @@ exclude = ["oak_abi", "oak_utils"]
# > explicit about the dependency relationships between the crates.
[patch.crates-io]
# Oak.
oak = { path = "sdk/rust/oak" }
oak_abi = { path = "oak_abi" }
oak_loader = { path = "oak/server/rust/oak_loader" }
oak_runtime = { path = "oak/server/rust/oak_runtime" }
oak_tests = { path = "sdk/rust/oak_tests" }
oak_utils = { path = "oak_utils" }
runner = { path = "runner" }
# Third party.
roughenough = { path = "third_party/roughenough" }
2 changes: 2 additions & 0 deletions oak_abi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[workspace]

[package]
name = "oak_abi"
version = "0.1.0"
Expand Down
2 changes: 2 additions & 0 deletions oak_utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[workspace]

[package]
name = "oak_utils"
version = "0.1.0"
Expand Down
Loading