Skip to content

Commit

Permalink
feat: enable RBE again
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeagle committed Jan 30, 2025
1 parent 3f7ad86 commit bfe05de
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 6 deletions.
11 changes: 9 additions & 2 deletions .aspect/workflows/bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,16 @@ common --remote_download_outputs=minimal
common --nobuild_runfile_links

# remote execution
common:rbe --extra_execution_platforms=//bazel/platforms:x86_64_linux_remote
common:rbe --host_platform=//bazel/platforms:x86_64_linux_remote
common:rbe --extra_execution_platforms=//tools/platforms:buildbarn_remote
common:rbe --host_platform=//tools/platforms:buildbarn_remote
common:rbe --remote_executor=unix:///mnt/ephemeral/buildbarn/.cache/bb_clientd/grpc
common:rbe --genrule_strategy=remote,local
common:rbe --jobs=32
common:rbe --remote_timeout=3600

# from https://github.com/bazelbuild/bazel/issues/4685#issuecomment-1366208392
test:rbe --strategy=CoverageReport=local
test:rbe --experimental_split_coverage_postprocessing
test:rbe --experimental_fetch_all_coverage_outputs
test:rbe --remote_download_outputs=all
test:rbe --experimental_remote_download_regex=.*/((testlogs/.*/_coverage/.*)|coverage.dat$|_coverage
1 change: 1 addition & 0 deletions .aspect/workflows/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ tasks:
- -//speller/...
bazel:
flags:
- --config=rbe
- --test_tag_filters=-skip-on-aspect-workflows
coverage:
codecov_upload: true
Expand Down
2 changes: 2 additions & 0 deletions logger/client/src/build/aspect/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ load("@rules_jvm_external//:defs.bzl", "artifact")
java_library(
name = "JavaLoggingClientLibrary",
srcs = ["JavaLoggingClientLibrary.java"],
tags = ["no-remote-exec"],
deps = [
"//logger/schema:logger_java_grpc",
"//logger/schema:logger_java_proto",
Expand All @@ -14,6 +15,7 @@ java_library(
java_binary(
name = "JavaLoggingClient",
srcs = ["JavaLoggingClient.java"],
tags = ["no-remote-exec"],
visibility = ["//visibility:public"],
deps = [":JavaLoggingClientLibrary"],
)
Expand Down
1 change: 1 addition & 0 deletions logger/schema/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ java_proto_library(
java_library(
name = "logger_java_grpc",
srcs = ["LoggerGrpc.java"],
tags = ["no-remote-exec"],
deps = [
":logger_java_proto",
artifact("com.google.guava:guava"),
Expand Down
5 changes: 4 additions & 1 deletion oci_go_image/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ container_structure_test(
configs = ["test.yaml"],
# Use the image built for the target platform as it runs through docker
image = ":transitioned_image",
tags = ["requires-docker"],
tags = [
"no-remote-exec",
"requires-docker",
],
)

oci_push(
Expand Down
5 changes: 4 additions & 1 deletion oci_python_image/hello_world/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ container_structure_test(
name = "test",
configs = ["test.yaml"],
image = ":platform_image",
tags = ["requires-docker"],
tags = [
"no-remote-exec",
"requires-docker",
],
)

py_test(
Expand Down
4 changes: 2 additions & 2 deletions bazel/platforms/BUILD.bazel → tools/platforms/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
platform(
name = "x86_64_linux_remote",
name = "buildbarn_remote",
constraint_values = [
"@platforms//os:linux",
"@platforms//cpu:x86_64",
],
exec_properties = {
"OSFamily": "Linux",
"container-image": "docker://ghcr.io/catthehacker/ubuntu:act-22.04@sha256:5f9c35c25db1d51a8ddaae5c0ba8d3c163c5e9a4a6cc97acd409ac7eae239448",
"container-image": "docker://public.ecr.aws/docker/library/python@sha256:247105bbbe7f7afc7c12ac893be65b5a32951c1d0276392dc2bf09861ba288a6",
},
visibility = ["//visibility:public"],
)

0 comments on commit bfe05de

Please sign in to comment.