launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-buildd:charmcraft-verbose into launchpad-buildd:master.

Commit message:
Run charmcraft in verbose mode

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/405455

Debugging failures can otherwise be rather difficult.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-buildd:charmcraft-verbose into launchpad-buildd:master.

diff --git a/debian/changelog b/debian/changelog
index 08c389d..e66175d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+launchpad-buildd (198) UNRELEASED; urgency=medium
+
+  * Run charmcraft in verbose mode.
+
+ -- Colin Watson <cjwatson@xxxxxxxxxx>  Fri, 09 Jul 2021 14:08:58 +0100
+
 launchpad-buildd (197) bionic; urgency=medium
 
   [ Tom Wardill ]
diff --git a/lpbuildd/target/build_charm.py b/lpbuildd/target/build_charm.py
index 6bd29cc..95da85e 100644
--- a/lpbuildd/target/build_charm.py
+++ b/lpbuildd/target/build_charm.py
@@ -109,7 +109,7 @@ class BuildCharm(VCSOperationMixin, SnapStoreOperationMixin, Operation):
             self.args.name,
             self.args.build_path)
         check_path_escape(self.buildd_path, build_context_path)
-        args = ["charmcraft", "build", "-f", build_context_path]
+        args = ["charmcraft", "build", "-v", "-f", build_context_path]
         self.run_build_command(args)
 
     def run(self):
diff --git a/lpbuildd/target/tests/test_build_charm.py b/lpbuildd/target/tests/test_build_charm.py
index 2900879..4e77943 100644
--- a/lpbuildd/target/tests/test_build_charm.py
+++ b/lpbuildd/target/tests/test_build_charm.py
@@ -295,7 +295,7 @@ class TestBuildCharm(TestCase):
         build_charm.build()
         self.assertThat(build_charm.backend.run.calls, MatchesListwise([
             RanBuildCommand(
-                ["charmcraft", "build", "-f",
+                ["charmcraft", "build", "-v", "-f",
                  "/home/buildd/test-image/."],
                 cwd="/home/buildd/test-image"),
             ]))
@@ -312,7 +312,7 @@ class TestBuildCharm(TestCase):
         build_charm.build()
         self.assertThat(build_charm.backend.run.calls, MatchesListwise([
             RanBuildCommand(
-                ["charmcraft", "build", "-f",
+                ["charmcraft", "build", "-v", "-f",
                  "/home/buildd/test-image/build-aux/"],
                 cwd="/home/buildd/test-image"),
             ]))
@@ -333,7 +333,7 @@ class TestBuildCharm(TestCase):
                 ["bzr", "branch", "lp:foo", "test-image"],
                 cwd="/home/buildd")),
             AnyMatch(RanBuildCommand(
-                ["charmcraft", "build", "-f",
+                ["charmcraft", "build", "-v", "-f",
                  "/home/buildd/test-image/."],
                 cwd="/home/buildd/test-image")),
             ))