From 7190bad1b0e81c6178b468dcdd8b6e7533ffe7ee Mon Sep 17 00:00:00 2001
From: Vince Grassia <593223+vgrassia@users.noreply.github.com>
Date: Thu, 5 Oct 2023 15:14:10 -0400
Subject: [PATCH] Standardize Snapcraft commands in workflows (#6351)

---
 .github/workflows/release-cli.yml     | 4 +---
 .github/workflows/release-desktop.yml | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml
index 73c0f24aff..04a8a04f4f 100644
--- a/.github/workflows/release-cli.yml
+++ b/.github/workflows/release-cli.yml
@@ -157,8 +157,6 @@ jobs:
 
       - name: Install Snap
         uses: samuelmeuli/action-snapcraft@d33c176a9b784876d966f80fb1b461808edc0641  # v2.1.1
-        with:
-          snapcraft_token: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }}
 
       - name: Download artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
@@ -185,7 +183,7 @@ jobs:
         env:
           SNAPCRAFT_STORE_CREDENTIALS: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }}
         run: |
-          snapcraft push bw_${{ env._PKG_VERSION }}_amd64.snap --release stable
+          snapcraft upload bw_${{ env._PKG_VERSION }}_amd64.snap --release stable
           snapcraft logout
 
   choco:
diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml
index 28314e8e9c..b9ffa80e51 100644
--- a/.github/workflows/release-desktop.yml
+++ b/.github/workflows/release-desktop.yml
@@ -270,8 +270,6 @@ jobs:
 
       - name: Install Snap
         uses: samuelmeuli/action-snapcraft@d33c176a9b784876d966f80fb1b461808edc0641 # v2.1.1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }}
 
       - name: Setup
         run: mkdir dist
@@ -302,8 +300,8 @@ jobs:
         env:
           SNAPCRAFT_STORE_CREDENTIALS: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }}
         run: |
-          /snap/bin/snapcraft upload bitwarden_${{ env._PKG_VERSION }}_amd64.snap --release stable
-          /snap/bin/snapcraft logout
+          snapcraft upload bitwarden_${{ env._PKG_VERSION }}_amd64.snap --release stable
+          snapcraft logout
         working-directory: apps/desktop/dist
 
   choco: