Skip to content

Commit 93f995a

Browse files
committed
Enable coverage job in CI for RBE
1 parent 9c70ec2 commit 93f995a

2 files changed

Lines changed: 16 additions & 0 deletions

File tree

.bazelci/presubmit.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ split_coverage_postprocessing_shell_commands: &split_coverage_postprocessing_she
9292
- echo "coverage --experimental_fetch_all_coverage_outputs" >> user.bazelrc
9393
- echo "coverage --experimental_split_coverage_postprocessing" >> user.bazelrc
9494
- echo "build --//rust/settings:experimental_use_coverage_metadata_files" >> user.bazelrc
95+
rbe_coverage_flags: &rbe_coverage_flags
96+
# https://github.com/bazelbuild/bazel/issues/20578
97+
- "--strategy=CoverageReport=local"
9598
tasks:
9699
ubuntu2204:
97100
build_targets: *default_linux_targets
@@ -106,6 +109,9 @@ tasks:
106109
- sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
107110
build_targets: *default_rbe_targets
108111
test_targets: *default_rbe_targets
112+
coverage_targets: *default_rbe_targets
113+
coverage_flags: *rbe_coverage_flags
114+
post_shell_commands: *coverage_validation_post_shell_commands
109115
macos:
110116
platform: macos_arm64
111117
build_targets: *default_macos_targets
@@ -133,6 +139,9 @@ tasks:
133139
shell_commands: *no_bzlmod_rbe_shell_commands
134140
build_targets: *default_rbe_targets
135141
test_targets: *default_rbe_targets
142+
coverage_targets: *default_rbe_targets
143+
coverage_flags: *rbe_coverage_flags
144+
post_shell_commands: *coverage_validation_post_shell_commands
136145
macos_no_bzlmod:
137146
name: No Bzlmod
138147
platform: macos_arm64
@@ -213,6 +222,9 @@ tasks:
213222
build_flags: *aspects_flags
214223
build_targets: *default_rbe_targets
215224
test_targets: *default_rbe_targets
225+
coverage_targets: *default_rbe_targets
226+
coverage_flags: *rbe_coverage_flags
227+
post_shell_commands: *coverage_validation_post_shell_commands
216228
rbe_ubuntu2204_rolling_with_aspects:
217229
name: RBE Rolling Bazel Version With Aspects
218230
platform: rbe_ubuntu2204
@@ -221,6 +233,9 @@ tasks:
221233
- sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
222234
build_targets: *default_rbe_targets
223235
test_targets: *default_rbe_targets
236+
coverage_targets: *default_rbe_targets
237+
coverage_flags: *rbe_coverage_flags
238+
post_shell_commands: *coverage_validation_post_shell_commands
224239
build_flags: *aspects_flags
225240
soft_fail: yes
226241
bazel: "rolling"

.bazelrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ coverage --combined_report=lcov
1818
# Avoid fully cached builds reporting no coverage and failing CI
1919
# https://bazel.build/reference/command-line-reference#flag--experimental_fetch_all_coverage_outputs
2020
coverage --experimental_fetch_all_coverage_outputs
21+
coverage --experimental_split_coverage_postprocessing
2122

2223
# Required for some of the tests
2324
# https://bazel.build/reference/command-line-reference#flag--experimental_cc_shared_library

0 commit comments

Comments
 (0)