Skip to content

Add progress_message to actions that currently do not have one #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: lucid-master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rules/private/phases/phase_binary_deployjar.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ def phase_binary_deployjar(ctx, g):
),
main_class = main_class,
output = ctx.outputs.deploy_jar,
progress_message = "scala deployable %s" % ctx.label,
progress_message = "Creating Scala deploy jar %{label}",
compression = True,
)
3 changes: 2 additions & 1 deletion rules/private/phases/phase_bootstrap_compile.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ def phase_bootstrap_compile(ctx, g):
"supports-path-mapping": "1",
},
inputs = inputs,
mnemonic = "BootstrapScalacompile",
mnemonic = "BootstrapScalaCompile",
progress_message = "Bootstrap Compiling Scala %{label}",
outputs = [g.classpaths.jar, tmp],
toolchain = "@rules_scala_annex//rules/scala:toolchain_type",
tools = [ctx.executable._jar_creator],
Expand Down
2 changes: 1 addition & 1 deletion rules/private/phases/phase_classpaths.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def phase_classpaths(ctx, g):
ctx,
inputs = deps,
output = plugin_singlejar,
progress_message = "singlejar scalac plugin %s" % plugin.label.name,
progress_message = "Creating SingleJar for Scalac plugin %{label}",
)
actual_plugins.append(plugin_singlejar)

Expand Down
1 change: 1 addition & 0 deletions rules/private/phases/phase_coverage_jacoco.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def phase_coverage_jacoco(ctx, g):
},
inputs = [in_out_pair[0] for in_out_pair in in_out_pairs],
mnemonic = "JacocoInstrumenter",
progress_message = "Analyzing Scala code coverage with JaCoCo %{label}",
outputs = [in_out_pair[1] for in_out_pair in in_out_pairs],
toolchain = "@rules_scala_annex//rules/scala:toolchain_type",
)
Expand Down
2 changes: 1 addition & 1 deletion rules/private/phases/phase_resources.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def phase_resources(ctx, g):
ctx,
inputs = [],
output = resource_jar,
progress_message = "singlejar resources %s" % ctx.label.name,
progress_message = "Creating SingleJar for resources %{label}",
resources = {
_resources_make_path(file, ctx.attr.resource_strip_prefix): file
for file in ctx.files.resources
Expand Down
7 changes: 6 additions & 1 deletion rules/private/phases/phase_singlejar.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,9 @@ def phase_singlejar(ctx, g):
jar = getattr(v, "jar")
inputs.append(jar)

_action_singlejar(ctx, inputs, ctx.outputs.jar)
_action_singlejar(
ctx,
inputs = inputs,
output = ctx.outputs.jar,
progress_message = "Creating SingleJar %{label}",
)
1 change: 1 addition & 0 deletions rules/private/phases/phase_zinc_compile.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ def phase_zinc_compile(ctx, g):
inputs = inputs,
mnemonic = "ScalaCompile",
outputs = outputs,
progress_message = "Compiling Scala %{label}",
toolchain = "@rules_scala_annex//rules/scala:toolchain_type",
)

Expand Down
1 change: 1 addition & 0 deletions rules/private/phases/phase_zinc_depscheck.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def phase_zinc_depscheck(ctx, g):
},
inputs = [g.compile.used],
mnemonic = "ScalaCheckDeps",
progress_message = "Checking Scala dependencies %{label}",
outputs = [deps_check],
toolchain = "@rules_scala_annex//rules/scala:toolchain_type",
)
Expand Down
1 change: 1 addition & 0 deletions rules/scala/private/doc.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ def scaladoc_implementation(ctx):
transitive = [classpath, compiler_classpath],
),
mnemonic = "ScalaDoc",
progress_message = "Generating Scaladoc %{label}",
outputs = [html, tmp],
toolchain = None,
)
Expand Down
4 changes: 2 additions & 2 deletions rules/scala_proto/private/core.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def scala_proto_library_implementation(ctx):
inputs = depset(direct = [], transitive = [transitive_sources]),
mnemonic = "ScalaProtoCompile",
outputs = [gendir],
progress_message = "Compiling %{label} protobuf into Scala source",
progress_message = "Compiling protobuf into Scala source %{label}",
toolchain = "@rules_scala_annex//rules/scala_proto:compiler_toolchain_type",
tools = [compiler.protoc],
)
Expand All @@ -73,7 +73,7 @@ def scala_proto_library_implementation(ctx):
inputs = [gendir],
mnemonic = "SrcJar",
outputs = [srcjar],
progress_message = "Bundling compiled Scala into srcjar for %{label}",
progress_message = "Bundling compiled Scala into srcjar %{label}",
toolchain = None,
tools = [ctx.executable._zipper],
)
Expand Down
3 changes: 3 additions & 0 deletions rules/scalafmt/private/test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ def build_format(ctx):
},
inputs = [config, src],
mnemonic = "ScalaFmt",
progress_message = "Formatting Scala %{label}",
outputs = [file],
toolchain = None,
)
Expand All @@ -82,6 +83,7 @@ def format_runner(ctx, manifest, files):
},
inputs = [ctx.file._runner, manifest] + files,
mnemonic = "CreateScalaFmtRunner",
progress_message = "Creating Scalafmt runner %{label}",
outputs = [ctx.outputs.scalafmt_runner],
toolchain = None,
)
Expand All @@ -101,6 +103,7 @@ def format_tester(ctx, manifest, files):
},
inputs = [ctx.file._testrunner, manifest] + files,
mnemonic = "CreateScalaFmtTester",
progress_message = "Creating Scalafmt tester %{label}",
outputs = [ctx.outputs.scalafmt_testrunner],
toolchain = None,
)
Expand Down