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

Move top-level Cargo.toml to oak/server #1139

Merged
merged 1 commit into from
Jun 16, 2020

Conversation

rbehjati
Copy link
Contributor

@rbehjati rbehjati commented Jun 11, 2020

This change:

  • Moves top-level Cargo.toml and Cargo.lock to oak/server
  • Updates the scripts and the README files accordingly
  • Removes --target-dir flags in scripts/build_example

Ref #971

Checklist

  • Pull request affects core Oak functionality (e.g. runtime, SDK, ABI)
    • I have written tests that cover the code changes.
    • I have checked that these tests are run by
      Cloudbuild
    • I have updated documentation accordingly.
    • I have raised an issue to
      cover any TODOs and/or unfinished work.
  • Pull request includes prototype/experimental work that is under
    construction.

@rbehjati rbehjati added the WIP Work in progress label Jun 11, 2020
@rbehjati rbehjati force-pushed the oak-971-move-cargo branch 8 times, most recently from 903b47e to 0824ba6 Compare June 15, 2020 19:33
@rbehjati rbehjati removed the WIP Work in progress label Jun 15, 2020
@rbehjati rbehjati marked this pull request as ready for review June 15, 2020 19:34
@@ -26,7 +26,6 @@ assemble_packer(
name = "assemble-oak-gcp-hello-world",
config = ":config.json",
files = {
"//oak/server/loader:oak_runner": "oak_runner",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think this line can be removed too:

"//oak/server/loader:oak_runner",

Or perhaps the entire build cpp server step should be removed. WDYT @tiziano88?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Not sure which step are you referring to? In any case @ipetr0v and / or @conradgrobler may be able to advise.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I meant the following chunk of code in the runner:

oak/runner/src/main.rs

Lines 217 to 242 in 2709157

v => {
let config = match v {
"base" => {
if is_mac_os() {
"darwin"
} else {
"clang"
}
}
"logless" => "clang-logless",
"arm" => "armv8",
"asan" => "asan",
"tsan" => "tsan",
_ => panic!("unknown variant: {}", v),
};
Step::Single {
name: "build cpp server".to_string(),
command: bazel_build(
&[&format!("--config={}", config)],
&[
"//oak/server/loader:oak_runner",
"//oak/server/storage:storage_server",
],
),
}
}

Its bash counterpart was removed in #1016.

@@ -26,7 +26,6 @@ assemble_packer(
name = "assemble-oak-gcp-hello-world",
config = ":config.json",
files = {
"//oak/server/loader:oak_runner": "oak_runner",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Not sure which step are you referring to? In any case @ipetr0v and / or @conradgrobler may be able to advise.

* Moves top-level `Cargo.toml` and `Cargo.lock` to `oak/server`
* Updates the scripts and the README files accordingly
* Removes `--target-dir` flags in `scripts/build_example`
@rbehjati rbehjati merged commit a1edeb9 into project-oak:master Jun 16, 2020
@rbehjati rbehjati deleted the oak-971-move-cargo branch June 16, 2020 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants