Skip to content

Commit 3dab8e3

Browse files
Use stage instead of prime in charmcraft files part (#382)
Fixes issue where files in charm directory conflict with files created by poetry plugin during staging
1 parent 3abf88b commit 3dab8e3

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

charmcraft.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ platforms:
88
# - dispatch (https://github.com/canonical/charmcraft/pull/1898)
99
# - manifest.yaml
1010
# (https://github.com/canonical/charmcraft/blob/9ff19c328e23b50cc06f04e8a5ad4835740badf4/charmcraft/services/package.py#L259)
11-
# Files implicitly copied/"primed" by charmcraft without a part:
11+
# Files implicitly copied/"staged" by charmcraft without a part:
1212
# - actions.yaml, config.yaml, metadata.yaml
1313
# (https://github.com/canonical/charmcraft/blob/9ff19c328e23b50cc06f04e8a5ad4835740badf4/charmcraft/services/package.py#L290-L293
1414
# https://github.com/canonical/charmcraft/blob/9ff19c328e23b50cc06f04e8a5ad4835740badf4/charmcraft/services/package.py#L156-L157)
@@ -40,7 +40,7 @@ parts:
4040
# "charm-poetry" part name is arbitrary; use for consistency
4141
# Avoid using "charm" part name since that has special meaning to charmcraft
4242
charm-poetry:
43-
# By default, the `poetry` plugin creates/primes these directories:
43+
# By default, the `poetry` plugin creates/stages these directories:
4444
# - lib, src
4545
# (https://github.com/canonical/charmcraft/blob/9ff19c328e23b50cc06f04e8a5ad4835740badf4/charmcraft/parts/plugins/_poetry.py#L76-L78)
4646
# - venv
@@ -92,7 +92,7 @@ parts:
9292
python3 -c 'import pathlib; import shutil; import subprocess; git_hash=subprocess.run(["git", "describe", "--always", "--dirty"], capture_output=True, check=True, encoding="utf-8").stdout; file = pathlib.Path("charm_version"); shutil.copy(file, pathlib.Path("charm_version.backup")); version = file.read_text().strip(); file.write_text(f"{version}+{git_hash}")'
9393
9494
craftctl default
95-
prime:
95+
stage:
9696
- LICENSE
9797
- charm_version
9898
- workload_version

0 commit comments

Comments
 (0)