From 49810beb244284383756925c48c754813e8118aa Mon Sep 17 00:00:00 2001
From: Vince Grassia <593223+vgrassia@users.noreply.github.com>
Date: Fri, 23 Aug 2024 07:54:51 -0400
Subject: [PATCH] BRE-272 - Fix Publish Workflows (#10693)

---
 .github/workflows/publish-cli.yml     |  9 ++++----
 .github/workflows/publish-desktop.yml | 33 +++++++++------------------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/publish-cli.yml b/.github/workflows/publish-cli.yml
index db91f1401c..09b6b53e58 100644
--- a/.github/workflows/publish-cli.yml
+++ b/.github/workflows/publish-cli.yml
@@ -152,14 +152,13 @@ jobs:
         run: New-Item -ItemType directory -Path ./dist
 
       - name: Download artifacts
-        shell: bash
-        run: wget https://github.com/bitwarden/clients/releases/download/cli-v${{ env._PKG_VERSION }}/bitwarden-cli.${{ env._PKG_VERSION }}.nupkg
+        run: Invoke-WebRequest -Uri "https://github.com/bitwarden/clients/releases/download/cli-v${{ env._PKG_VERSION }}/bitwarden-cli.${{ env._PKG_VERSION }}.nupkg" -OutFile bitwarden-cli.${{ env._PKG_VERSION }}.nupkg
+        working-directory: apps/cli/dist
 
       - name: Push to Chocolatey
         if: ${{ inputs.publish_type != 'Dry Run' }}
-        run: |
-          cd dist
-          choco push --source=https://push.chocolatey.org/
+        run: choco push --source=https://push.chocolatey.org/
+        working-directory: apps/cli/dist
 
   npm:
     name: Publish NPM
diff --git a/.github/workflows/publish-desktop.yml b/.github/workflows/publish-desktop.yml
index 0554270645..c03697fc80 100644
--- a/.github/workflows/publish-desktop.yml
+++ b/.github/workflows/publish-desktop.yml
@@ -15,7 +15,7 @@ on:
           - Republish
           - Dry Run
       version:
-        description: 'Version to publish (default: latest cli release)'
+        description: 'Version to publish (default: latest desktop release)'
         required: true
         type: string
         default: latest
@@ -35,10 +35,6 @@ on:
         default: true
         type: boolean
 
-defaults:
-  run:
-    shell: bash
-
 jobs:
   setup:
     name: Setup
@@ -129,19 +125,15 @@ jobs:
           secrets: "aws-electron-access-id,
             aws-electron-access-key,
             aws-electron-bucket-name"
-
-      - name: Download all artifacts
-        if: ${{ inputs.publish_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@main
-        with:
-          workflow: build-desktop.yml
-          workflow_conclusion: success
-          branch: ${{ github.ref_name }}
-          path: apps/desktop/artifacts
+      
+      - name: Create artifacts directory
+        run: mkdir -p apps/desktop/artifacts
 
       - name: Download artifacts
+        env:
+          GH_TOKEN: ${{ github.token }}
         working-directory: apps/desktop/artifacts
-        run: gh release download ${{ env._RELEASE_TAG }} -R bitwarden/desktop
+        run: gh release download ${{ env._RELEASE_TAG }} -R bitwarden/clients
 
       - name: Set staged rollout percentage
         env:
@@ -186,7 +178,7 @@ jobs:
     name: Deploy Snap
     runs-on: ubuntu-22.04
     needs: setup
-    if: ${{ inputs.snap_publish == 'true' }}
+    if: inputs.snap_publish
     env:
       _PKG_VERSION: ${{ needs.setup.outputs.release-version }}
       _RELEASE_TAG: ${{ needs.setup.outputs.tag-name }}
@@ -215,7 +207,7 @@ jobs:
 
       - name: Download artifacts
         working-directory: apps/desktop/dist
-        run: wget https://github.com/bitwarden/clients/releases/${{ env._RELEASE_TAG }}/download/bitwarden_${{ env._PKG_VERSION }}_amd64.snap
+        run: wget https://github.com/bitwarden/clients/releases/download/${{ env._RELEASE_TAG }}/bitwarden_${{ env._PKG_VERSION }}_amd64.snap
 
       - name: Deploy to Snap Store
         if: ${{ inputs.publish_type != 'Dry Run' }}
@@ -230,7 +222,7 @@ jobs:
     name: Deploy Choco
     runs-on: windows-2022
     needs: setup
-    if: ${{ inputs.choco_publish == 'true' }}
+    if: inputs.choco_publish
     env:
       _PKG_VERSION: ${{ needs.setup.outputs.release-version }}
       _RELEASE_TAG: ${{ needs.setup.outputs.tag-name }}
@@ -256,23 +248,20 @@ jobs:
           secrets: "cli-choco-api-key"
 
       - name: Setup Chocolatey
-        shell: pwsh
         run: choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/
         env:
           CHOCO_API_KEY: ${{ steps.retrieve-secrets.outputs.cli-choco-api-key }}
 
       - name: Make dist dir
-        shell: pwsh
         run: New-Item -ItemType directory -Path ./dist
         working-directory: apps/desktop
 
       - name: Download artifacts
         working-directory: apps/desktop/dist
-        run: wget https://github.com/bitwarden/clients/releases/${{ env._RELEASE_TAG }}/download/bitwarden.${{ env._PKG_VERSION }}.nupkg
+        run: Invoke-WebRequest -Uri "https://github.com/bitwarden/clients/releases/download/${{ env._RELEASE_TAG }}/bitwarden.${{ env._PKG_VERSION }}.nupkg" -OutFile bitwarden.${{ env._PKG_VERSION }}.nupkg
 
       - name: Push to Chocolatey
         if: ${{ inputs.publish_type != 'Dry Run' }}
-        shell: pwsh
         run: choco push --source=https://push.chocolatey.org/
         working-directory: apps/desktop/dist