From 8708fb45a2ce35f089b0c887c3d8c82b5315e025 Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Wed, 22 Jan 2025 11:05:58 +0100 Subject: [PATCH] Use stage instead of prime in charmcraft files part Fixes issue where files in charm directory conflict with files created by poetry plugin during staging --- charmcraft.yaml | 6 +++--- tests/integration/application-charm/charmcraft.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charmcraft.yaml b/charmcraft.yaml index b6c351c..3e86e43 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -9,7 +9,7 @@ platforms: # - dispatch (https://github.com/canonical/charmcraft/pull/1898) # - manifest.yaml # (https://github.com/canonical/charmcraft/blob/9ff19c328e23b50cc06f04e8a5ad4835740badf4/charmcraft/services/package.py#L259) -# Files implicitly copied/"primed" by charmcraft without a part: +# Files implicitly copied/"staged" by charmcraft without a part: # - actions.yaml, config.yaml, metadata.yaml # (https://github.com/canonical/charmcraft/blob/9ff19c328e23b50cc06f04e8a5ad4835740badf4/charmcraft/services/package.py#L290-L293 # https://github.com/canonical/charmcraft/blob/9ff19c328e23b50cc06f04e8a5ad4835740badf4/charmcraft/services/package.py#L156-L157) @@ -41,7 +41,7 @@ parts: # "charm-poetry" part name is arbitrary; use for consistency # Avoid using "charm" part name since that has special meaning to charmcraft charm-poetry: - # By default, the `poetry` plugin creates/primes these directories: + # By default, the `poetry` plugin creates/stages these directories: # - lib, src # (https://github.com/canonical/charmcraft/blob/9ff19c328e23b50cc06f04e8a5ad4835740badf4/charmcraft/parts/plugins/_poetry.py#L76-L78) # - venv @@ -83,5 +83,5 @@ parts: files: plugin: dump source: . - prime: + stage: - LICENSE diff --git a/tests/integration/application-charm/charmcraft.yaml b/tests/integration/application-charm/charmcraft.yaml index 3e6275b..064d278 100644 --- a/tests/integration/application-charm/charmcraft.yaml +++ b/tests/integration/application-charm/charmcraft.yaml @@ -9,7 +9,7 @@ platforms: # - dispatch (https://github.com/canonical/charmcraft/pull/1898) # - manifest.yaml # (https://github.com/canonical/charmcraft/blob/9ff19c328e23b50cc06f04e8a5ad4835740badf4/charmcraft/services/package.py#L259) -# Files implicitly copied/"primed" by charmcraft without a part: +# Files implicitly copied/"staged" by charmcraft without a part: # - actions.yaml, config.yaml, metadata.yaml # (https://github.com/canonical/charmcraft/blob/9ff19c328e23b50cc06f04e8a5ad4835740badf4/charmcraft/services/package.py#L290-L293 # https://github.com/canonical/charmcraft/blob/9ff19c328e23b50cc06f04e8a5ad4835740badf4/charmcraft/services/package.py#L156-L157) @@ -41,7 +41,7 @@ parts: # "charm-poetry" part name is arbitrary; use for consistency # Avoid using "charm" part name since that has special meaning to charmcraft charm-poetry: - # By default, the `poetry` plugin creates/primes these directories: + # By default, the `poetry` plugin creates/stages these directories: # - lib, src # (https://github.com/canonical/charmcraft/blob/9ff19c328e23b50cc06f04e8a5ad4835740badf4/charmcraft/parts/plugins/_poetry.py#L76-L78) # - venv