From cf1f3b63e5c6542728bef406b8fcdecf4a82bb7e Mon Sep 17 00:00:00 2001
From: deadc0de6 <info@deadc0de.ch>
Date: Wed, 14 Dec 2022 16:00:26 +0100
Subject: [PATCH] refactor snapcraft release

---
 .github/workflows/snapcraft-release.yml | 37 +++++++++++++++----------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/snapcraft-release.yml b/.github/workflows/snapcraft-release.yml
index 7bc55e9..0cd411c 100644
--- a/.github/workflows/snapcraft-release.yml
+++ b/.github/workflows/snapcraft-release.yml
@@ -4,23 +4,30 @@ on:
     types: [created]
   workflow_dispatch:
 jobs:
-  snapcraft_publish:
+  build:
     runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@v2
-    - name: Build and Publish Snapcraft
+    - uses: snapcore/action-build@v1
+      id: build-snap
+      with:
+        path: ./packages/snap
+    - uses: actions/upload-artifact@v3
+      with:
+        name: dotdrop
+        path: ${{ steps.build-snap.outputs.snap }}
+
+  publish:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+    - uses: actions/download-artifact@v3
+      with:
+        name: dotdrop
+        path: .
+    - uses: snapcore/action-publish@v1
       env:
-        SNAPCRAFT_BUILD_ENVIRONMENT: host
-        RELEASE_TAG: ${{ github.ref }}
         SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_LOGIN }}
-      working-directory: ./packages/snap/
-      run: |
-        export MAGIC=$SNAP/usr/share/file/magic.mgc
-        sudo apt update
-        sudo apt -y install git python3-pip python3-setuptools
-        sudo apt -y install snapd
-        sudo snap install snapcraft --classic
-        snapcraft login
-        snapcraft
-        version=$(echo ${RELEASE_TAG} | sed 's#^.*v##g')
-        snapcraft upload --release=stable dotdrop_${version}_amd64.snap
+      with:
+        snap: ${{needs.build.outputs.snap-file}}
+        release: 'stable'