Skip to content

Commit 654538f

Browse files
committed
Fix messed up rebase
1 parent 9364d3a commit 654538f

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/code_checker.bzl

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,12 @@ def _run_code_checker(
7474
headers = depset([src], transitive = [compilation_context.headers])
7575
inputs = depset([compile_commands_json, src], transitive = [headers])
7676

77-
outputs = [clang_tidy_plist, clangsa_plist, codechecker_log]
77+
outputs = [
78+
clang_tidy_plist,
79+
clangsa_plist,
80+
codechecker_log,
81+
codechecker_metadata,
82+
]
7883

7984
# Create CodeChecker wrapper script
8085
wrapper = ctx.actions.declare_file(ctx.attr.name + "/code_checker.sh")
@@ -131,7 +136,6 @@ def check_valid_file_type(src):
131136
return False
132137

133138
def _rule_sources(ctx):
134-
135139
srcs = []
136140
if hasattr(ctx.rule.attr, "srcs"):
137141
for src in ctx.rule.attr.srcs:
@@ -329,6 +333,7 @@ def _per_file_impl(ctx):
329333
sources_and_headers,
330334
)
331335
all_files += outputs
336+
332337
# merge metadata
333338
metadata = [file for file in all_files if file.path.endswith("metadata.json")]
334339
metadata_json = ctx.actions.declare_file(ctx.attr.name + "/data/metadata.json")
@@ -338,7 +343,7 @@ def _per_file_impl(ctx):
338343
executable = ctx.executable._metadata_merge_script,
339344
arguments = [metadata_json.path] + [file.path for file in metadata],
340345
mnemonic = "Metadata",
341-
progress_message = "Merging metadata.json"
346+
progress_message = "Merging metadata.json",
342347
)
343348
all_files.append(metadata_json)
344349
ctx.actions.write(
@@ -382,7 +387,7 @@ per_file_test = rule(
382387
"_metadata_merge_script": attr.label(
383388
default = ":metadata_merge",
384389
executable = True,
385-
cfg = 'exec',
390+
cfg = "exec",
386391
),
387392
"_python_runtime": attr.label(
388393
default = "@default_python_tools//:py3_runtime",

0 commit comments

Comments
 (0)