Skip to content

Commit

Permalink
renames everything but need to generate new protos.
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcusSorealheis committed Dec 9, 2023
1 parent d264624 commit 581b09d
Show file tree
Hide file tree
Showing 166 changed files with 1,903 additions and 1,148 deletions.
4 changes: 2 additions & 2 deletions .bazelignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bazel-out
bazel-remote-bin
bazel-remote-out
bazel-remote-testlogs
bazel-remote-native-link
bazel-remote-nativelink
bazel-root
bazel-testlogs
bazel-native-link
bazel-nativelink
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
target/
*/*/.terraform-native-link-builder
*/*/.terraform-nativelink-builder
*/*/.update_scheduler_ips.zip
*/*/terraform.tfstate
*/*/.terraform
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
branches: [ main ]

jobs:
docker-compose-compiles-native-link:
docker-compose-compiles-nativelink:
# The type of runner that the job will run on.
runs-on: ubuntu-22.04
strategy:
Expand All @@ -30,7 +30,7 @@ jobs:
OS_VERSION=${{ matrix.os_version }}
ADDITIONAL_SETUP_WORKER_CMD=DEBIAN_FRONTEND=noninteractive apt-get install -y gcc g++ lld pkg-config python3
load: true # This brings the build into `docker images` from buildx.
tags: trace_machina/native-link:latest
tags: trace_machina/nativelink:latest
- uses: docker/build-push-action@v4
with:
context: .
Expand All @@ -39,7 +39,7 @@ jobs:
OPT_LEVEL=opt
OS_VERSION=${{ matrix.os_version }}
load: true # This brings the build into `docker images` from buildx.
tags: trace_machina/native-link:builder
tags: trace_machina/nativelink:builder
target: builder

- name: Compile Native Link with Native Link
Expand All @@ -48,15 +48,15 @@ jobs:
cd deployment-examples/docker-compose && \
docker-compose up -d && \
cd ../../ && \
docker run --rm --net=host -w /root/native-link -v $PWD:/root/native-link trace_machina/native-link:builder sh -c ' \
docker run --rm --net=host -w /root/nativelink -v $PWD:/root/nativelink trace_machina/nativelink:builder sh -c ' \
bazel clean && \
bazel test //... \
--remote_instance_name=main \
--remote_cache=grpc://127.0.0.1:50051 \
--remote_executor=grpc://127.0.0.1:50052 \
--remote_default_exec_properties=cpu_count=1 \
' && \
docker run --rm --net=host -w /root/native-link -v $PWD:/root/native-link trace_machina/native-link:builder sh -c ' \
docker run --rm --net=host -w /root/nativelink -v $PWD:/root/nativelink trace_machina/nativelink:builder sh -c ' \
bazel clean && \
bazel test //... \
--remote_instance_name=main \
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
OPT_LEVEL=fastbuild
OS_VERSION=${{ matrix.os_version }}
load: true # This brings the build into `docker images` from buildx.
tags: trace_machina/native-link:latest
tags: trace_machina/nativelink:latest

- name: Run tests
run: ./run_integration_tests.sh
12 changes: 6 additions & 6 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ rust_binary(
],
deps = [
"//error",
"//native-link-config",
"//native-link-scheduler",
"//native-link-service",
"//native-link-store",
"//native-link-util",
"//native-link-worker",
"//nativelink-config",
"//nativelink-scheduler",
"//nativelink-service",
"//nativelink-store",
"//nativelink-util",
"//nativelink-worker",
"//proto",
"@crate_index//:async-lock",
"@crate_index//:axum",
Expand Down
66 changes: 33 additions & 33 deletions Cargo.Bazel.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7968,8 +7968,8 @@
},
"license": "MIT/Apache-2.0"
},
"native-link 0.0.0": {
"name": "native-link",
"nativelink 0.0.0": {
"name": "nativelink",
"version": "0.0.0",
"repository": null,
"targets": [],
Expand Down Expand Up @@ -8052,22 +8052,22 @@
},
"license": null
},
"native-link-config 0.0.0": {
"name": "native-link-config",
"nativelink-config 0.0.0": {
"name": "nativelink-config",
"version": "0.0.0",
"repository": null,
"targets": [
{
"Library": {
"crate_name": "native_link_config",
"crate_name": "nativelink_config",
"crate_root": "src/lib.rs",
"srcs": [
"**/*.rs"
]
}
}
],
"library_target_name": "native_link_config",
"library_target_name": "nativelink_config",
"common_attrs": {
"compile_data_glob": [
"**"
Expand All @@ -8090,22 +8090,22 @@
},
"license": null
},
"native-link-scheduler 0.0.0": {
"name": "native-link-scheduler",
"nativelink-scheduler 0.0.0": {
"name": "nativelink-scheduler",
"version": "0.0.0",
"repository": null,
"targets": [
{
"Library": {
"crate_name": "native_link_scheduler",
"crate_name": "nativelink_scheduler",
"crate_root": "src/lib.rs",
"srcs": [
"**/*.rs"
]
}
}
],
"library_target_name": "native_link_scheduler",
"library_target_name": "nativelink_scheduler",
"common_attrs": {
"compile_data_glob": [
"**"
Expand Down Expand Up @@ -8190,22 +8190,22 @@
},
"license": null
},
"native-link-service 0.0.0": {
"name": "native-link-service",
"nativelink-service 0.0.0": {
"name": "nativelink-service",
"version": "0.0.0",
"repository": null,
"targets": [
{
"Library": {
"crate_name": "native_link_service",
"crate_name": "nativelink_service",
"crate_root": "src/lib.rs",
"srcs": [
"**/*.rs"
]
}
}
],
"library_target_name": "native_link_service",
"library_target_name": "nativelink_service",
"common_attrs": {
"compile_data_glob": [
"**"
Expand Down Expand Up @@ -8289,22 +8289,22 @@
},
"license": null
},
"native-link-store 0.0.0": {
"name": "native-link-store",
"nativelink-store 0.0.0": {
"name": "nativelink-store",
"version": "0.0.0",
"repository": null,
"targets": [
{
"Library": {
"crate_name": "native_link_store",
"crate_name": "nativelink_store",
"crate_root": "src/lib.rs",
"srcs": [
"**/*.rs"
]
}
}
],
"library_target_name": "native_link_store",
"library_target_name": "nativelink_store",
"common_attrs": {
"compile_data_glob": [
"**"
Expand Down Expand Up @@ -8457,22 +8457,22 @@
},
"license": null
},
"native-link-util 0.0.0": {
"name": "native-link-util",
"nativelink-util 0.0.0": {
"name": "nativelink-util",
"version": "0.0.0",
"repository": null,
"targets": [
{
"Library": {
"crate_name": "native_link_util",
"crate_name": "nativelink_util",
"crate_root": "src/lib.rs",
"srcs": [
"**/*.rs"
]
}
}
],
"library_target_name": "native_link_util",
"library_target_name": "nativelink_util",
"common_attrs": {
"compile_data_glob": [
"**"
Expand Down Expand Up @@ -8585,22 +8585,22 @@
},
"license": null
},
"native-link-worker 0.0.0": {
"name": "native-link-worker",
"nativelink-worker 0.0.0": {
"name": "nativelink-worker",
"version": "0.0.0",
"repository": null,
"targets": [
{
"Library": {
"crate_name": "native_link_worker",
"crate_name": "nativelink_worker",
"crate_root": "src/lib.rs",
"srcs": [
"**/*.rs"
]
}
}
],
"library_target_name": "native_link_worker",
"library_target_name": "nativelink_worker",
"common_attrs": {
"compile_data_glob": [
"**"
Expand Down Expand Up @@ -17387,13 +17387,13 @@
"binary_crates": [],
"workspace_members": {
"error 0.0.0": "error",
"native-link 0.0.0": "",
"native-link-config 0.0.0": "native-link-config",
"native-link-scheduler 0.0.0": "native-link-scheduler",
"native-link-service 0.0.0": "native-link-service",
"native-link-store 0.0.0": "native-link-store",
"native-link-util 0.0.0": "native-link-util",
"native-link-worker 0.0.0": "native-link-worker",
"nativelink 0.0.0": "",
"nativelink-config 0.0.0": "nativelink-config",
"nativelink-scheduler 0.0.0": "nativelink-scheduler",
"nativelink-service 0.0.0": "nativelink-service",
"nativelink-store 0.0.0": "nativelink-store",
"nativelink-util 0.0.0": "nativelink-util",
"nativelink-worker 0.0.0": "nativelink-worker",
"proto 0.0.0": "proto"
},
"conditions": {
Expand Down
Loading

0 comments on commit 581b09d

Please sign in to comment.