From 6aa5c627570bc04f34de21ff500f52b55f43116d Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Mon, 12 Aug 2024 14:37:09 +0000 Subject: [PATCH 1/2] Standardize prime plugin in charmcraft.yaml --- charmcraft.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/charmcraft.yaml b/charmcraft.yaml index d10b951ba..eace4f402 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -10,6 +10,13 @@ bases: - name: "ubuntu" channel: "22.04" parts: + files: + plugin: dump + source: . + prime: + - charm_version + - charm_internal_version + - workload_version charm: override-build: | rustup default stable @@ -26,10 +33,3 @@ parts: - pkg-config - rustc - cargo - version_data: - plugin: dump - source: . - prime: - - charm_version - - charm_internal_version - - workload_version From bd2110a65322f0910564a1fa84f7fc2377c27594 Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Mon, 12 Aug 2024 14:47:32 +0000 Subject: [PATCH 2/2] Update charm_internal_version --- charm_internal_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charm_internal_version b/charm_internal_version index b6a7d89c6..98d9bcb75 100644 --- a/charm_internal_version +++ b/charm_internal_version @@ -1 +1 @@ -16 +17