From 1a6f2837714eb95b427c66ebc8fa2ebb965f801c Mon Sep 17 00:00:00 2001
From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com>
Date: Tue, 24 Aug 2021 11:58:21 -0700
Subject: [PATCH] Removing the old setup logic that no longer works (#974)

* Removing the old setup logic that no longer works

* adding in formatting
---
 .github/workflows/deploy.yml | 46 ++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e6f261f36b..9b53102981 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -21,34 +21,27 @@ jobs:
       - name: Create Deploy version vars
         id: create_tags
         run: |
-          if ! [[ "${{ github.event_name }}" -eq "release" ]]; then
-            case "${RELEASE_TAG_NAME_INPUT:0:1}" in
-              v)
-                echo "RELEASE_NAME=${RELEASE_TAG_NAME_INPUT:1}" >> $GITHUB_ENV
-                echo "RELEASE_TAG_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
-                echo "::set-output name=package_version::${RELEASE_TAG_NAME_INPUT:1}"
-                echo "::set-output name=tag_version::$RELEASE_TAG_NAME_INPUT"
-                ;;
-              [0-9])
-                echo "RELEASE_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
-                echo "RELEASE_TAG_NAME=v$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
-                echo "::set-output name=package_version::$RELEASE_TAG_NAME_INPUT"
-                echo "::set-output name=tag_version::v$RELEASE_TAG_NAME_INPUT"
-                ;;
-              *)
-                exit 1
-                ;;
-            esac
-          else
-            TAG_VERSION=$(echo ${{ github.ref }} | cut -d "/" -f 3)
-            PKG_VERSION=${TAG_VERSION:1}
-
-            echo "::set-output name=package_version::$PKG_VERSION"
-            echo "::set-output name=tag_version::$TAG_VERSION"
-          fi
+          case "${RELEASE_TAG_NAME_INPUT:0:1}" in
+            v)
+              echo "RELEASE_NAME=${RELEASE_TAG_NAME_INPUT:1}" >> $GITHUB_ENV
+              echo "RELEASE_TAG_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
+              echo "::set-output name=package_version::${RELEASE_TAG_NAME_INPUT:1}"
+              echo "::set-output name=tag_version::$RELEASE_TAG_NAME_INPUT"
+              ;;
+            [0-9])
+              echo "RELEASE_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
+              echo "RELEASE_TAG_NAME=v$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
+              echo "::set-output name=package_version::$RELEASE_TAG_NAME_INPUT"
+              echo "::set-output name=tag_version::v$RELEASE_TAG_NAME_INPUT"
+              ;;
+            *)
+              exit 1
+              ;;
+          esac
         env:
           RELEASE_TAG_NAME_INPUT: ${{ github.event.inputs.release_tag_name_input }}
 
+
   snap:
     name: Deploy Snap
     runs-on: ubuntu-latest
@@ -84,6 +77,7 @@ jobs:
           snapcraft upload dist/bitwarden_${{ env.PKG_VERSION }}_amd64.snap --release stable
           snapcraft logout
 
+
   choco:
     name: Deploy Choco
     runs-on: windows-latest
@@ -126,6 +120,7 @@ jobs:
           cd dist
           choco push
 
+
   macos:
     name: Deploy MacOS
     runs-on: macos-latest
@@ -155,6 +150,7 @@ jobs:
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
 
 
+
   auto-updater-deploy:
     name: Release auto-updater files
     runs-on: ubuntu-latest