-
Notifications
You must be signed in to change notification settings - Fork 111
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
Conversation
903b47e
to
0824ba6
Compare
@@ -26,7 +26,6 @@ assemble_packer( | |||
name = "assemble-oak-gcp-hello-world", | |||
config = ":config.json", | |||
files = { | |||
"//oak/server/loader:oak_runner": "oak_runner", |
There was a problem hiding this comment.
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:
Line 237 in 2709157
"//oak/server/loader:oak_runner", |
Or perhaps the entire
build cpp server
step should be removed. WDYT @tiziano88?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
:
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", |
There was a problem hiding this comment.
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.
0824ba6
to
a2cf832
Compare
* 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`
a2cf832
to
f67b554
Compare
This change:
Cargo.toml
andCargo.lock
tooak/server
--target-dir
flags inscripts/build_example
Ref #971
Checklist
Cloudbuild
cover any TODOs and/or unfinished work.
construction.