From ba0afc9e7c072303d8ba4dd786cb39b75cd9c2fe Mon Sep 17 00:00:00 2001 From: Raul Zamora Date: Fri, 6 Dec 2024 12:10:17 +0100 Subject: [PATCH] test --- charmcraft.yaml | 10 ++++++++-- poetry.lock | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/charmcraft.yaml b/charmcraft.yaml index 7aae96450..cef46d298 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -3,11 +3,17 @@ type: charm # base: ubuntu@22.04 +# platforms: +# amd64: +# Use upcoming ST124 syntax +# To pack this charm, a temporary compatibility wrapper https://github.com/canonical/charmcraftst124 +# is required until ST124 support is added to charmcraft +# (ST124 syntax is needed to enable multi-base charms with Ubuntu 24.04. We use ST124 syntax across +# all of our charms [even those that aren't multi base] for consistency and to simplify CI/CD +# maintenance & tooling) platforms: ubuntu@22.04:amd64: ubuntu@24.04:amd64: -# platforms: -# amd64: parts: files: plugin: dump diff --git a/poetry.lock b/poetry.lock index 8d75f2618..9e7da453b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1730,7 +1730,7 @@ pyyaml = "*" type = "git" url = "https://github.com/canonical/data-platform-workflows" reference = "beta-charmcraftst124" -resolved_reference = "cb2b1f4317d45de67370835bdc4ad95bb1871b80" +resolved_reference = "21e4258d2aa93cd666dbd50f7c8b965e490bb51a" subdirectory = "python/pytest_plugins/pytest_operator_cache" [[package]]