← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/turnip:charm-fix-part-name into turnip:master

 

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

Commit message:
charm: Fix final part name

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/448495

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/turnip:charm-fix-part-name into turnip:master.
diff --git a/charm/turnip-api/charmcraft.yaml b/charm/turnip-api/charmcraft.yaml
index 04dbde1..0304685 100644
--- a/charm/turnip-api/charmcraft.yaml
+++ b/charm/turnip-api/charmcraft.yaml
@@ -128,7 +128,7 @@ parts:
       - layers
     prime:
       - "-layers"
-  turnip-api:
+  charm:
     after:
       - charm-wheels
       - interface-rabbitmq
diff --git a/charm/turnip-celery/charmcraft.yaml b/charm/turnip-celery/charmcraft.yaml
index e207b32..0304685 100644
--- a/charm/turnip-celery/charmcraft.yaml
+++ b/charm/turnip-celery/charmcraft.yaml
@@ -128,7 +128,7 @@ parts:
       - layers
     prime:
       - "-layers"
-  turnip-celery:
+  charm:
     after:
       - charm-wheels
       - interface-rabbitmq
diff --git a/charm/turnip-pack-backend/charmcraft.yaml b/charm/turnip-pack-backend/charmcraft.yaml
index 4a0a48c..0304685 100644
--- a/charm/turnip-pack-backend/charmcraft.yaml
+++ b/charm/turnip-pack-backend/charmcraft.yaml
@@ -128,7 +128,7 @@ parts:
       - layers
     prime:
       - "-layers"
-  turnip-pack-backend:
+  charm:
     after:
       - charm-wheels
       - interface-rabbitmq
diff --git a/charm/turnip-pack-frontend-git/charmcraft.yaml b/charm/turnip-pack-frontend-git/charmcraft.yaml
index 683c01a..c06999b 100644
--- a/charm/turnip-pack-frontend-git/charmcraft.yaml
+++ b/charm/turnip-pack-frontend-git/charmcraft.yaml
@@ -127,7 +127,7 @@ parts:
       - layers
     prime:
       - "-layers"
-  turnip-pack-frontend-git:
+  charm:
     after:
       - charm-wheels
       - interface-rabbitmq
diff --git a/charm/turnip-pack-frontend-http/charmcraft.yaml b/charm/turnip-pack-frontend-http/charmcraft.yaml
index 7dcd129..0304685 100644
--- a/charm/turnip-pack-frontend-http/charmcraft.yaml
+++ b/charm/turnip-pack-frontend-http/charmcraft.yaml
@@ -128,7 +128,7 @@ parts:
       - layers
     prime:
       - "-layers"
-  turnip-pack-frontend-http:
+  charm:
     after:
       - charm-wheels
       - interface-rabbitmq
diff --git a/charm/turnip-pack-frontend-ssh/charmcraft.yaml b/charm/turnip-pack-frontend-ssh/charmcraft.yaml
index 41afd55..c06999b 100644
--- a/charm/turnip-pack-frontend-ssh/charmcraft.yaml
+++ b/charm/turnip-pack-frontend-ssh/charmcraft.yaml
@@ -127,7 +127,7 @@ parts:
       - layers
     prime:
       - "-layers"
-  turnip-pack-frontend-ssh:
+  charm:
     after:
       - charm-wheels
       - interface-rabbitmq
diff --git a/charm/turnip-pack-virt/charmcraft.yaml b/charm/turnip-pack-virt/charmcraft.yaml
index dca1aab..c06999b 100644
--- a/charm/turnip-pack-virt/charmcraft.yaml
+++ b/charm/turnip-pack-virt/charmcraft.yaml
@@ -127,7 +127,7 @@ parts:
       - layers
     prime:
       - "-layers"
-  turnip-pack-virt:
+  charm:
     after:
       - charm-wheels
       - interface-rabbitmq