From 8298439ef5e8728ac414c0d591c2320b65af3cd7 Mon Sep 17 00:00:00 2001
From: barco <marco.basile@canonical.com>
Date: Tue, 19 Nov 2024 11:22:00 +0100
Subject: [PATCH] ci: fix charm publish action for Ubuntu 24.04

---
 .github/workflows/publish.yaml |  6 ++++++
 charmcraft.yaml                | 10 +++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index e9e17db4..66f4d5b7 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -53,9 +53,15 @@ jobs:
           echo "setting output of destination_channel=$destination_channel"
           echo "::set-output name=destination_channel::$destination_channel"
 
+      - name: Setup lxd
+        uses: canonical/setup-lxd@v0.1.2
+        with:
+          channel: latest/stable
+
       - name: Upload charm to charmhub
         uses: canonical/charming-actions/upload-charm@934193396735701141a1decc3613818e412da606 # 2.6.3
         with:
           credentials: ${{ secrets.CHARMCRAFT_CREDENTIALS }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           channel: ${{ steps.parse-inputs.outputs.destination_channel }}
+          destructive-mode: false
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 1300e28b..16b43f0d 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -98,13 +98,9 @@ actions:
   get-redirect-uri:
     description: Get the Kratos' client redirect_uri
 
-bases:
-  - build-on:
-      - name: "ubuntu"
-        channel: "22.04"
-    run-on:
-      - name: "ubuntu"
-        channel: "22.04"
+base: ubuntu@22.04
+platforms:
+  amd64:
 
 parts:
   charm: