commit 8a9273812fd7126273d2f645b0370a166b1c3e47
author Rob Mohr <mohrr@google.com> Thu Sep 12 22:38:28 2024 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 12 22:38:28 2024 +0000
tree 50eda7314d26e1183acd35d662d196b0cf88201f
parent f1d125e795485018b9bdecc85f00b4b6f9bb40b2

bazel_roller, txt_roller: Use roll_commit_message module

Bug: b/359925419
Change-Id: Ie144eaec923b8fc3499349c74188456a43b298d5
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/235480
Reviewed-by: Oliver Newman <olivernewman@google.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Reviewed-by: Danielle Kay <danikay@google.com>

recipe_modules/bazel_roll/tests/full.py

diff --git a/recipe_modules/bazel_roll/tests/full.py b/recipe_modules/bazel_roll/tests/full.py
index d01dbb8..a8db328 100644
--- a/recipe_modules/bazel_roll/tests/full.py
+++ b/recipe_modules/bazel_roll/tests/full.py
@@ -18,8 +18,8 @@
 from recipe_engine import post_process
 
 DEPS = [
-    "fuchsia/git_roll_util",
     "fuchsia/gitiles",
+    "fuchsia/roll_commit_message",
     "pigweed/bazel_roll",
     "pigweed/checkout",
     "pigweed/roll_util",
@@ -44,7 +44,7 @@
     )
 
     pres = api.step.empty('commit message').presentation
-    pres.step_summary_text = api.git_roll_util.format_commit_message(
+    pres.step_summary_text = api.roll_commit_message.format(
         *rolls,
         roll_prefix='roll:',
         send_comment=True,

recipe_modules/txt_roll/tests/full.py

diff --git a/recipe_modules/txt_roll/tests/full.py b/recipe_modules/txt_roll/tests/full.py
index ffc0b92..5bdfb2c 100644
--- a/recipe_modules/txt_roll/tests/full.py
+++ b/recipe_modules/txt_roll/tests/full.py
@@ -17,8 +17,8 @@
 from PB.recipe_modules.pigweed.txt_roll.tests.full import InputProperties
 
 DEPS = [
-    "fuchsia/git_roll_util",
     "fuchsia/gitiles",
+    "fuchsia/roll_commit_message",
     "pigweed/checkout",
     "pigweed/txt_roll",
     "recipe_engine/properties",
@@ -41,7 +41,7 @@
 
     if rolls:
         pres = api.step.empty('commit message').presentation
-        pres.step_summary_text = api.git_roll_util.format_commit_message(
+        pres.step_summary_text = api.roll_commit_message.format(
             *rolls,
             roll_prefix="roll:",
             send_comment=True,

recipes/bazel_roller.py

diff --git a/recipes/bazel_roller.py b/recipes/bazel_roller.py
index ccef042..eed4b27 100644
--- a/recipes/bazel_roller.py
+++ b/recipes/bazel_roller.py
@@ -52,6 +52,7 @@
     'fuchsia/auto_roller',
     'fuchsia/git_roll_util',
     'fuchsia/gitiles',
+    "fuchsia/roll_commit_message",
     'pigweed/bazel_roll',
     'pigweed/checkout',
     'recipe_engine/properties',
@@ -88,7 +89,7 @@
     change: api.auto_roller.GerritChange = api.auto_roller.attempt_roll(
         props.auto_roller_options,
         repo_dir=checkout.root,
-        commit_message=api.git_roll_util.format_commit_message(
+        commit_message=api.roll_commit_message.format(
             *rolls,
             roll_prefix='roll:',
             send_comment=True,

recipes/txt_roller.py

diff --git a/recipes/txt_roller.py b/recipes/txt_roller.py
index a24649b..3473615 100644
--- a/recipes/txt_roller.py
+++ b/recipes/txt_roller.py
@@ -36,6 +36,7 @@
     'fuchsia/auto_roller',
     'fuchsia/git_roll_util',
     'fuchsia/gitiles',
+    "fuchsia/roll_commit_message",
     'pigweed/checkout',
     'pigweed/txt_roll',
     'recipe_engine/properties',
@@ -71,7 +72,7 @@
     change = api.auto_roller.attempt_roll(
         props.auto_roller_options,
         repo_dir=checkout.root,
-        commit_message=api.git_roll_util.format_commit_message(
+        commit_message=api.roll_commit_message.format(
             *rolls,
             roll_prefix="roll:",
             send_comment=True,