From 88bdd1ee8cfed0b8f9c8c388ae6cb8cbba7fe61e Mon Sep 17 00:00:00 2001
From: Kian Parvin <46668016+kian99@users.noreply.github.com>
Date: Tue, 27 Jun 2023 14:51:13 +0200
Subject: [PATCH] Added --classic to charmcraft snap install (#971)

* Added --classic to charmcraft snap install

* Ensure name of snap is correct
---
 .github/workflows/charm-release.yaml | 4 ++--
 .github/workflows/snap.yaml          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/charm-release.yaml b/.github/workflows/charm-release.yaml
index 51ea9cdc7..11af5f849 100644
--- a/.github/workflows/charm-release.yaml
+++ b/.github/workflows/charm-release.yaml
@@ -54,9 +54,9 @@ jobs:
         with:
           name: jimm-snap
       - name: Install charmcraft
-        run: sudo snap install charmcraft --channel=2.x/stable
+        run: sudo snap install charmcraft --channel=2.x/stable --classic
       - name: Publish Charm Resource
-        run: charmcraft upload-resource juju-jimm jimm-snap --filepath ./jimm-snap
+        run: charmcraft upload-resource juju-jimm jimm-snap --filepath ./jimm.snap
         env:
           CHARMCRAFT_AUTH: "${{ secrets.CHARMHUB_TOKEN }}"
       - name: Upload charm to charmhub
diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml
index 8c4fde36d..a08306ac1 100644
--- a/.github/workflows/snap.yaml
+++ b/.github/workflows/snap.yaml
@@ -19,7 +19,7 @@ jobs:
       - run: sudo snap install snapcraft --channel=7.x/stable --classic
       - run: mkdir -p snap
       - run: cp ./snaps/jimm/snapcraft.yaml ./snap/snapcraft.yaml
-      - run: snapcraft --destructive-mode
+      - run: snapcraft --destructive-mode --output jimm.snap
       - uses: actions/upload-artifact@v3
         with:
           name: jimm-snap