From e8c0615b7d1793d9ec616bca7502ca86ffb7a74b Mon Sep 17 00:00:00 2001 From: James Judd Date: Fri, 18 Apr 2025 18:25:40 -0600 Subject: [PATCH] Add progress_message to actions that currently do not have one --- rules/private/phases/phase_binary_deployjar.bzl | 2 +- rules/private/phases/phase_bootstrap_compile.bzl | 3 ++- rules/private/phases/phase_classpaths.bzl | 2 +- rules/private/phases/phase_coverage_jacoco.bzl | 1 + rules/private/phases/phase_resources.bzl | 2 +- rules/private/phases/phase_singlejar.bzl | 7 ++++++- rules/private/phases/phase_zinc_compile.bzl | 1 + rules/private/phases/phase_zinc_depscheck.bzl | 1 + rules/scala/private/doc.bzl | 1 + rules/scala_proto/private/core.bzl | 4 ++-- rules/scalafmt/private/test.bzl | 3 +++ 11 files changed, 20 insertions(+), 7 deletions(-) diff --git a/rules/private/phases/phase_binary_deployjar.bzl b/rules/private/phases/phase_binary_deployjar.bzl index d8f956c85..4c3933e0c 100644 --- a/rules/private/phases/phase_binary_deployjar.bzl +++ b/rules/private/phases/phase_binary_deployjar.bzl @@ -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, ) diff --git a/rules/private/phases/phase_bootstrap_compile.bzl b/rules/private/phases/phase_bootstrap_compile.bzl index 770f3df5d..e03eeaaf5 100644 --- a/rules/private/phases/phase_bootstrap_compile.bzl +++ b/rules/private/phases/phase_bootstrap_compile.bzl @@ -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], diff --git a/rules/private/phases/phase_classpaths.bzl b/rules/private/phases/phase_classpaths.bzl index 80cfd2125..fd32884f8 100644 --- a/rules/private/phases/phase_classpaths.bzl +++ b/rules/private/phases/phase_classpaths.bzl @@ -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) diff --git a/rules/private/phases/phase_coverage_jacoco.bzl b/rules/private/phases/phase_coverage_jacoco.bzl index 255576163..858185166 100644 --- a/rules/private/phases/phase_coverage_jacoco.bzl +++ b/rules/private/phases/phase_coverage_jacoco.bzl @@ -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", ) diff --git a/rules/private/phases/phase_resources.bzl b/rules/private/phases/phase_resources.bzl index d201d0cc1..90344c17d 100644 --- a/rules/private/phases/phase_resources.bzl +++ b/rules/private/phases/phase_resources.bzl @@ -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 diff --git a/rules/private/phases/phase_singlejar.bzl b/rules/private/phases/phase_singlejar.bzl index 4bcbc1cf8..94f2dcea0 100644 --- a/rules/private/phases/phase_singlejar.bzl +++ b/rules/private/phases/phase_singlejar.bzl @@ -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}", + ) diff --git a/rules/private/phases/phase_zinc_compile.bzl b/rules/private/phases/phase_zinc_compile.bzl index 1d72ccac8..ff4e6d613 100644 --- a/rules/private/phases/phase_zinc_compile.bzl +++ b/rules/private/phases/phase_zinc_compile.bzl @@ -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", ) diff --git a/rules/private/phases/phase_zinc_depscheck.bzl b/rules/private/phases/phase_zinc_depscheck.bzl index 23a8fa774..5655da1ea 100644 --- a/rules/private/phases/phase_zinc_depscheck.bzl +++ b/rules/private/phases/phase_zinc_depscheck.bzl @@ -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", ) diff --git a/rules/scala/private/doc.bzl b/rules/scala/private/doc.bzl index fcc417b52..826d83cd6 100644 --- a/rules/scala/private/doc.bzl +++ b/rules/scala/private/doc.bzl @@ -66,6 +66,7 @@ def scaladoc_implementation(ctx): transitive = [classpath, compiler_classpath], ), mnemonic = "ScalaDoc", + progress_message = "Generating Scaladoc %{label}", outputs = [html, tmp], toolchain = None, ) diff --git a/rules/scala_proto/private/core.bzl b/rules/scala_proto/private/core.bzl index 669d42b7f..0a133612b 100644 --- a/rules/scala_proto/private/core.bzl +++ b/rules/scala_proto/private/core.bzl @@ -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], ) @@ -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], ) diff --git a/rules/scalafmt/private/test.bzl b/rules/scalafmt/private/test.bzl index ae97b2603..539b2d2b1 100644 --- a/rules/scalafmt/private/test.bzl +++ b/rules/scalafmt/private/test.bzl @@ -57,6 +57,7 @@ def build_format(ctx): }, inputs = [config, src], mnemonic = "ScalaFmt", + progress_message = "Formatting Scala %{label}", outputs = [file], toolchain = None, ) @@ -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, ) @@ -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, )