From aff6e2ca184e9539f28dd326c06478ca2dbfee4c Mon Sep 17 00:00:00 2001
From: Jagandeep Brar <me@jagandeepbrar.io>
Date: Wed, 15 Jun 2022 01:35:59 -0400
Subject: [PATCH] fix(ci): utilize latest standard for Snapcraft login

[skip ci]
---
 .github/actions/prepare_for_deployment/action.yml | 10 ----------
 .github/workflows/publish_linux.yml               | 10 +++++++---
 .github/workflows/release.yml                     |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.github/actions/prepare_for_deployment/action.yml b/.github/actions/prepare_for_deployment/action.yml
index a9a00494..297d6337 100644
--- a/.github/actions/prepare_for_deployment/action.yml
+++ b/.github/actions/prepare_for_deployment/action.yml
@@ -23,10 +23,6 @@ inputs:
     description: 'Google Play Store API Key'
     required: false
     default: ''
-  snapcraft-token:
-    description: 'Snapcraft API Key'
-    required: false
-    default: ''
 
 runs:
   using: composite
@@ -48,12 +44,6 @@ runs:
       with:
         bundler-cache: true
     
-    - name: Install Snapcraft
-      if: ${{ inputs.channel == 'snapcraft' }}
-      uses: samuelmeuli/action-snapcraft@v1
-      with:
-        snapcraft_token: ${{ inputs.snapcraft-token }}
-
     - name: Install XCode
       if: ${{ inputs.channel == 'app-store' }}
       uses: maxim-lobanov/setup-xcode@v1
diff --git a/.github/workflows/publish_linux.yml b/.github/workflows/publish_linux.yml
index 64fd1dd6..431442a5 100644
--- a/.github/workflows/publish_linux.yml
+++ b/.github/workflows/publish_linux.yml
@@ -14,7 +14,7 @@ on:
         type: string
 
     secrets:
-      SNAPCRAFT_TOKEN:
+      SNAPCRAFT_STORE_CREDENTIALS:
         required: true
       S3_ACCESS_KEY:
         required: true
@@ -36,7 +36,6 @@ jobs:
         uses: JagandeepBrar/LunaSea/.github/actions/prepare_for_deployment@master
         with:
           channel: snapcraft
-          snapcraft-token: ${{ secrets.SNAPCRAFT_TOKEN }}
 
       - name: Download Snap
         uses: actions/download-artifact@v3
@@ -45,7 +44,12 @@ jobs:
           path: ${{ github.workspace }}/output
 
       - name: Deploy to Snapcraft
-        run: snapcraft upload --release=${{ inputs.flavor }} ${{ github.workspace }}/output/lunasea-linux-amd64.snap
+        uses: snapcore/action-publish@v1
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
+        with:
+          release: ${{ inputs.flavor }}
+          snap: ${{ github.workspace }}/output/lunasea-linux-amd64.snap
 
   s3:
     name: S3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 48b04eb2..57b38308 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -160,7 +160,7 @@ jobs:
       build-number: ${{ needs.prepare.outputs.build-number }}
       build-title: ${{ needs.prepare.outputs.build-title }}
     secrets:
-      SNAPCRAFT_TOKEN: ${{ secrets.SNAPCRAFT_TOKEN }}
+      SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
       S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
       S3_BUCKET: ${{ secrets.S3_BUCKET }}
       S3_ENDPOINT: ${{ secrets.S3_ENDPOINT }}