diff --git a/README.md b/README.md index 7a9480cc9..b0874b0ad 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh # --release causes link-time-optmization to be enabled, which can take a while # to compile, but will result in a much faster binary. -cargo run --release --bin cas -- ./config/examples/basic_cas.json +cargo run --release --bin cas -- ./native-link-config/examples/basic_cas.json ``` In a separate terminal session, run the following command to connect the running server launched above to Bazel or another RBE client: ```sh @@ -45,7 +45,7 @@ bazel test //... \ --remote_executor=grpc://127.0.0.1:50051 \ --remote_default_exec_properties=cpu_count=1 ``` -This will cause bazel to run the commands through an all-in-one `CAS`, `scheduler` and `worker`. See [here](https://github.com/tracemachina/native-link/tree/master/config) for configuration documentation and [here](https://github.com/tracemachina/native-link/tree/main/deployment-examples/terraform) for an example of multi-node cloud deployment example. +This will cause bazel to run the commands through an all-in-one `CAS`, `scheduler` and `worker`. See [here](https://github.com/tracemachina/native-link/tree/master/native-link-config) for configuration documentation and [here](https://github.com/tracemachina/native-link/tree/main/deployment-examples/terraform) for an example of multi-node cloud deployment example. ## Example Deployments We currently have a few example deployments in [deployment-examples directory](https://github.com/tracemachina/native-link/tree/master/deployment-examples). @@ -107,7 +107,7 @@ cargo build --release ### Configure -Configuration is done via a JSON file that is passed in as the first parameter to the `cas` program. See [here](https://github.com/tracemachina/native-link/tree/master/config) for more details and examples. +Configuration is done via a JSON file that is passed in as the first parameter to the `cas` program. See [here](https://github.com/tracemachina/native-link/tree/master/native-link-config) for more details and examples. ## How to update internal or external rust deps diff --git a/native-link-config/README.md b/native-link-config/README.md index 9eeb8af47..02cf812e4 100644 --- a/native-link-config/README.md +++ b/native-link-config/README.md @@ -3,14 +3,14 @@ This service uses a JSON file as the configuration format. The JSON format is compatible with how protobuf's JSON format is structed. -To view the available fields please refer to [stores.rs](https://github.com/tracemachina/native-link/blob/master/config/stores.rs) and [cas_server](https://github.com/tracemachina/native-link/blob/master/config/cas_server.rs). +To view the available fields please refer to [stores.rs](https://github.com/tracemachina/native-link/blob/master/native-link-config/stores.rs) and [cas_server](https://github.com/tracemachina/native-link/blob/master/native-link-config/cas_server.rs). These two files should have enough documentation in them on what each field does and where each field goes. ## Examples -The [examples directory](https://github.com/tracemachina/native-link/tree/master/config/examples) contains a few examples of configuration files. +The [examples directory](https://github.com/tracemachina/native-link/tree/master/native-link-config/examples) contains a few examples of configuration files. A very basic configuration that is a pure in-memory store is: diff --git a/proto/com/github/trace_machina/native_link/remote_execution/worker_api.proto b/proto/com/github/trace_machina/native_link/remote_execution/worker_api.proto index b9622660f..f2d5d00cc 100644 --- a/proto/com/github/trace_machina/native_link/remote_execution/worker_api.proto +++ b/proto/com/github/trace_machina/native_link/remote_execution/worker_api.proto @@ -85,7 +85,7 @@ message SupportedProperties { /// the unsupported properties. /// /// The details on how to use this property can be found here: - /// https://github.com/tracemachina/native-link/blob/c91f61edf182f2b64451fd48a5e63fa506a43aae/config/cas_server.rs + /// https://github.com/TraceMachina/native-link/blob/3147265047544572e3483c985e4aab0f9fdded38/native-link-config/src/cas_server.rs repeated build.bazel.remote.execution.v2.Platform.Property properties = 1; reserved 2; // NextId. } diff --git a/proto/genproto/com.github.trace_machina.native_link.remote_execution.pb.rs b/proto/genproto/com.github.trace_machina.native_link.remote_execution.pb.rs index 902b6177d..edb32447f 100644 --- a/proto/genproto/com.github.trace_machina.native_link.remote_execution.pb.rs +++ b/proto/genproto/com.github.trace_machina.native_link.remote_execution.pb.rs @@ -42,7 +42,7 @@ pub struct SupportedProperties { /// / the unsupported properties. /// / /// / The details on how to use this property can be found here: - /// / + /// / #[prost(message, repeated, tag = "1")] pub properties: ::prost::alloc::vec::Vec< super::super::super::super::super::build::bazel::remote::execution::v2::platform::Property,