lp-archive

Merge ~cjwatson/lp-archive:charm-fix-part-name into lp-archive:main

  1. Git
  2. lp:~cjwatson/lp-archive
  3. charm-fix-part-name
  4. Merge into main
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 1b37ca8e69c6b6ae743b932131c1b41703fe77ac
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/lp-archive:charm-fix-part-name
Merge into: lp-archive:main
Diff against target: 13 lines (+1/-1)
1 file modified
charm/lp-archive/charmcraft.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Simone Pelosi Approve
Review via email: mp+448500@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
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/lp-archive/charmcraft.yaml b/charm/lp-archive/charmcraft.yaml
2index 27b0e26..fc42982 100644
3--- a/charm/lp-archive/charmcraft.yaml
4+++ b/charm/lp-archive/charmcraft.yaml
5@@ -29,7 +29,7 @@ parts:
6 "*": ols-layers/
7 prime:
8 - "-ols-layers"
9- lp-archive:
10+ charm:
11 after:
12 - charm-wheels
13 - ols-layers

Subscribers

People subscribed via source and target branches