From 4a8efa6bc9769292a4041c51636466a5e6a95dca Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Wed, 30 Dec 2020 14:18:29 +0100
Subject: [PATCH] Use snap actions instead of the broken container

The container didn't work properly for our base snap anyway.
---
 .github/workflows/deploy.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ab82e56c..6b0ac968 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -30,25 +30,27 @@ jobs:
         if: ${{ github.event_name == 'release' && github.event.release.prerelease }}
   snap:
     runs-on: ubuntu-latest
-    container: snapcore/snapcraft
     steps:
       - uses: actions/checkout@v2
       - run: |
           VERSION=$(grep '"version"' package.json | cut -d '"' -f 4)
           echo $VERSION
           sed -i "s/@VERSION@/$VERSION/g" snap/snapcraft.yaml
-      - run: snapcraft
+      - uses: snapcore/action-build@v1
+        id: snapcraft
       - uses: actions/upload-artifact@v2
         with:
           name: snap
-          path: novnc*.snap
-      - run: |
-          mkdir .snapcraft
-          echo ${SNAPCRAFT_LOGIN} | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg
-        env:
-          SNAPCRAFT_LOGIN: ${{secrets.SNAPCRAFT_LOGIN}}
-        if: ${{ github.event_name == 'release' }}
-      - run: snapcraft push --release=stable *.snap
+          path: ${{ steps.snapcraft.outputs.snap }}
+      - uses: snapcore/action-publish@v1
+        with:
+          store_login: ${{ secrets.SNAPCRAFT_LOGIN }}
+          snap: ${{ steps.build.outputs.snap }}
+          release: stable
         if: ${{ github.event_name == 'release' && !github.event.release.prerelease }}
-      - run: snapcraft push --release=beta *.snap
+      - uses: snapcore/action-publish@v1
+        with:
+          store_login: ${{ secrets.SNAPCRAFT_LOGIN }}
+          snap: ${{ steps.build.outputs.snap }}
+          release: beta
         if: ${{ github.event_name == 'release' && github.event.release.prerelease }}