launchpad-reviewers team mailing list archive

[Colin Watson <mp+448502@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lp-codeimport:charm-fix-part-name into lp-codeimport:master.

Commit message:
charm: Fix final part name

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lp-codeimport/+git/lp-codeimport/+merge/448502

The example in https://juju.is/docs/sdk/charmcraft-yaml#heading--the-reactive-plugin calls the final (and in that case only) part "charm".  I'd thought that was just an example.  However, as of https://github.com/canonical/charmcraft/commit/35adadf42c625c5ee5ed6d611c9bdec10413ae59 in charmcraft 2.4.0, calling the final part anything else causes charms to be misbuilt; they end up containing unmodified copies of the top-level `actions.yaml`, `config.yaml`, and `metadata.yaml` files rather than merging the information provided by each layer.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-codeimport:charm-fix-part-name into lp-codeimport:master.

diff --git a/charm/lp-codeimport-storage/charmcraft.yaml b/charm/lp-codeimport-storage/charmcraft.yaml
index ac76470..14cc685 100644
--- a/charm/lp-codeimport-storage/charmcraft.yaml
+++ b/charm/lp-codeimport-storage/charmcraft.yaml
@@ -31,7 +31,7 @@ parts:
       - layers
     prime:
       - "-layers"
-  lp-codeimport-storage:
+  charm:
     after:
       - charm-wheels
       - ols-layers
diff --git a/charm/lp-codeimport/charmcraft.yaml b/charm/lp-codeimport/charmcraft.yaml
index 147b002..09f8a2d 100644
--- a/charm/lp-codeimport/charmcraft.yaml
+++ b/charm/lp-codeimport/charmcraft.yaml
@@ -31,7 +31,7 @@ parts:
       - layers
     prime:
       - "-layers"
-  lp-codeimport:
+  charm:
     after:
       - charm-wheels
       - ols-layers