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

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 0df1e34bfbfe0818e9655930a7685f6f705ad419
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/turnip:charm-fix-part-name
Merge into: turnip:master
Diff against target: 91 lines (+7/-7)
7 files modified
charm/turnip-api/charmcraft.yaml (+1/-1)
charm/turnip-celery/charmcraft.yaml (+1/-1)
charm/turnip-pack-backend/charmcraft.yaml (+1/-1)
charm/turnip-pack-frontend-git/charmcraft.yaml (+1/-1)
charm/turnip-pack-frontend-http/charmcraft.yaml (+1/-1)
charm/turnip-pack-frontend-ssh/charmcraft.yaml (+1/-1)
charm/turnip-pack-virt/charmcraft.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Simone Pelosi Approve
Guruprasad Approve
Review via email: mp+448495@code.launchpad.net

Commit message

charm: Fix final part name

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Guruprasad (lgp171188) wrote :

LGTM 👍

review: Approve
Revision history for this message
Simone Pelosi (pelpsi) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/turnip-api/charmcraft.yaml b/charm/turnip-api/charmcraft.yaml
2index 04dbde1..0304685 100644
3--- a/charm/turnip-api/charmcraft.yaml
4+++ b/charm/turnip-api/charmcraft.yaml
5@@ -128,7 +128,7 @@ parts:
6 - layers
7 prime:
8 - "-layers"
9- turnip-api:
10+ charm:
11 after:
12 - charm-wheels
13 - interface-rabbitmq
14diff --git a/charm/turnip-celery/charmcraft.yaml b/charm/turnip-celery/charmcraft.yaml
15index e207b32..0304685 100644
16--- a/charm/turnip-celery/charmcraft.yaml
17+++ b/charm/turnip-celery/charmcraft.yaml
18@@ -128,7 +128,7 @@ parts:
19 - layers
20 prime:
21 - "-layers"
22- turnip-celery:
23+ charm:
24 after:
25 - charm-wheels
26 - interface-rabbitmq
27diff --git a/charm/turnip-pack-backend/charmcraft.yaml b/charm/turnip-pack-backend/charmcraft.yaml
28index 4a0a48c..0304685 100644
29--- a/charm/turnip-pack-backend/charmcraft.yaml
30+++ b/charm/turnip-pack-backend/charmcraft.yaml
31@@ -128,7 +128,7 @@ parts:
32 - layers
33 prime:
34 - "-layers"
35- turnip-pack-backend:
36+ charm:
37 after:
38 - charm-wheels
39 - interface-rabbitmq
40diff --git a/charm/turnip-pack-frontend-git/charmcraft.yaml b/charm/turnip-pack-frontend-git/charmcraft.yaml
41index 683c01a..c06999b 100644
42--- a/charm/turnip-pack-frontend-git/charmcraft.yaml
43+++ b/charm/turnip-pack-frontend-git/charmcraft.yaml
44@@ -127,7 +127,7 @@ parts:
45 - layers
46 prime:
47 - "-layers"
48- turnip-pack-frontend-git:
49+ charm:
50 after:
51 - charm-wheels
52 - interface-rabbitmq
53diff --git a/charm/turnip-pack-frontend-http/charmcraft.yaml b/charm/turnip-pack-frontend-http/charmcraft.yaml
54index 7dcd129..0304685 100644
55--- a/charm/turnip-pack-frontend-http/charmcraft.yaml
56+++ b/charm/turnip-pack-frontend-http/charmcraft.yaml
57@@ -128,7 +128,7 @@ parts:
58 - layers
59 prime:
60 - "-layers"
61- turnip-pack-frontend-http:
62+ charm:
63 after:
64 - charm-wheels
65 - interface-rabbitmq
66diff --git a/charm/turnip-pack-frontend-ssh/charmcraft.yaml b/charm/turnip-pack-frontend-ssh/charmcraft.yaml
67index 41afd55..c06999b 100644
68--- a/charm/turnip-pack-frontend-ssh/charmcraft.yaml
69+++ b/charm/turnip-pack-frontend-ssh/charmcraft.yaml
70@@ -127,7 +127,7 @@ parts:
71 - layers
72 prime:
73 - "-layers"
74- turnip-pack-frontend-ssh:
75+ charm:
76 after:
77 - charm-wheels
78 - interface-rabbitmq
79diff --git a/charm/turnip-pack-virt/charmcraft.yaml b/charm/turnip-pack-virt/charmcraft.yaml
80index dca1aab..c06999b 100644
81--- a/charm/turnip-pack-virt/charmcraft.yaml
82+++ b/charm/turnip-pack-virt/charmcraft.yaml
83@@ -127,7 +127,7 @@ parts:
84 - layers
85 prime:
86 - "-layers"
87- turnip-pack-virt:
88+ charm:
89 after:
90 - charm-wheels
91 - interface-rabbitmq

Subscribers

People subscribed via source and target branches