Colin Watson has proposed merging ~cjwatson/launchpad:charm-fix-part-name into launchpad:master.
Commit message: charm: Fix final part name Requested reviews: Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/448498 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/launchpad:charm-fix-part-name into launchpad:master.
diff --git a/charm/launchpad-admin/charmcraft.yaml b/charm/launchpad-admin/charmcraft.yaml index cc04c46..2851717 100644 --- a/charm/launchpad-admin/charmcraft.yaml +++ b/charm/launchpad-admin/charmcraft.yaml @@ -47,7 +47,7 @@ parts: - layers prime: - "-layers" - launchpad-admin: + charm: after: - charm-wheels - launchpad-layers diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml index 7c06e0a..88ebf0c 100644 --- a/charm/launchpad-appserver/charmcraft.yaml +++ b/charm/launchpad-appserver/charmcraft.yaml @@ -59,7 +59,7 @@ parts: - layers prime: - "-layers" - launchpad-appserver: + charm: after: - charm-wheels - launchpad-layers diff --git a/charm/launchpad-assets/charmcraft.yaml b/charm/launchpad-assets/charmcraft.yaml index 684ec68..2a53f26 100644 --- a/charm/launchpad-assets/charmcraft.yaml +++ b/charm/launchpad-assets/charmcraft.yaml @@ -57,7 +57,7 @@ parts: - layers prime: - "-layers" - launchpad-assets: + charm: after: - charm-wheels - launchpad-layers diff --git a/charm/launchpad-buildd-manager/charmcraft.yaml b/charm/launchpad-buildd-manager/charmcraft.yaml index d1e89a5..2851717 100644 --- a/charm/launchpad-buildd-manager/charmcraft.yaml +++ b/charm/launchpad-buildd-manager/charmcraft.yaml @@ -47,7 +47,7 @@ parts: - layers prime: - "-layers" - launchpad-buildd-manager: + charm: after: - charm-wheels - launchpad-layers diff --git a/charm/launchpad-debian-importer/charmcraft.yaml b/charm/launchpad-debian-importer/charmcraft.yaml index af6e248..2851717 100644 --- a/charm/launchpad-debian-importer/charmcraft.yaml +++ b/charm/launchpad-debian-importer/charmcraft.yaml @@ -47,7 +47,7 @@ parts: - layers prime: - "-layers" - launchpad-debian-importer: + charm: after: - charm-wheels - launchpad-layers diff --git a/charm/launchpad-ftpmaster-publisher/charmcraft.yaml b/charm/launchpad-ftpmaster-publisher/charmcraft.yaml index 9c677c4..96c2906 100644 --- a/charm/launchpad-ftpmaster-publisher/charmcraft.yaml +++ b/charm/launchpad-ftpmaster-publisher/charmcraft.yaml @@ -48,7 +48,7 @@ parts: - layers prime: - "-layers" - launchpad-ftpmaster-publisher: + charm: after: - charm-wheels - launchpad-layers diff --git a/charm/launchpad-ftpmaster-uploader/charmcraft.yaml b/charm/launchpad-ftpmaster-uploader/charmcraft.yaml index 955cfb9..990f677 100644 --- a/charm/launchpad-ftpmaster-uploader/charmcraft.yaml +++ b/charm/launchpad-ftpmaster-uploader/charmcraft.yaml @@ -48,7 +48,7 @@ parts: - layers prime: - "-layers" - launchpad-ftpmaster-uploader: + charm: after: - charm-wheels - launchpad-layers diff --git a/charm/launchpad-librarian/charmcraft.yaml b/charm/launchpad-librarian/charmcraft.yaml index 7ada805..3544b5d 100644 --- a/charm/launchpad-librarian/charmcraft.yaml +++ b/charm/launchpad-librarian/charmcraft.yaml @@ -48,7 +48,7 @@ parts: - layers prime: - "-layers" - launchpad-librarian: + charm: after: - charm-wheels - launchpad-layers diff --git a/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml b/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml index 93d22d8..2851717 100644 --- a/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml +++ b/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml @@ -47,7 +47,7 @@ parts: - layers prime: - "-layers" - launchpad-scripts-bzrsyncd: + charm: after: - charm-wheels - launchpad-layers diff --git a/charm/launchpad-scripts/charmcraft.yaml b/charm/launchpad-scripts/charmcraft.yaml index 3e0d025..2851717 100644 --- a/charm/launchpad-scripts/charmcraft.yaml +++ b/charm/launchpad-scripts/charmcraft.yaml @@ -47,7 +47,7 @@ parts: - layers prime: - "-layers" - launchpad-scripts: + charm: after: - charm-wheels - launchpad-layers diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml index 4904ba0..0834f5f 100644 --- a/charm/launchpad/charmcraft.yaml +++ b/charm/launchpad/charmcraft.yaml @@ -46,7 +46,7 @@ parts: - layers prime: - "-layers" - launchpad: + charm: after: - charm-wheels - launchpad-layers
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp