From 55fa4a5f632c2de30c6b276e4add339c28ca7605 Mon Sep 17 00:00:00 2001
From: Vince Grassia <593223+vgrassia@users.noreply.github.com>
Date: Thu, 30 Sep 2021 12:12:42 -0400
Subject: [PATCH] Update QA Deploy workflow with fix for zip archive (#1612)

---
 .github/workflows/build.yml     |  1 +
 .github/workflows/qa-deploy.yml | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8b518b7b12..60cb765bac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -167,6 +167,7 @@ jobs:
           pwd
           ls -atlh ../../../
 
+      # This isn't using the Zip archive created from the last step.
       - name: Upload service artifact
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
diff --git a/.github/workflows/qa-deploy.yml b/.github/workflows/qa-deploy.yml
index 6f7868de67..3a2ab2d219 100644
--- a/.github/workflows/qa-deploy.yml
+++ b/.github/workflows/qa-deploy.yml
@@ -86,9 +86,13 @@ jobs:
           echo "NAME_LOWER: $NAME_LOWER"
           echo "::set-output name=name_lower::$NAME_LOWER"
 
-          BRANCH_NAME=$(echo "{{ github.ref }}" | awk '{split($0, a, "/"); print a[3]}')
+          BRANCH_NAME=$(echo "$GITHUB_REF" | awk '{split($0, a, "/"); print a[3]}')
+          echo "GITHUB_REF: $GITHUB_REF"
+          echo "BRANCH_NAME: $BRANCH_NAME"
           echo "::set-output name=branch_name::$BRANCH_NAME"
 
+          mkdir publish
+
       - name: Download latest ${{ matrix.name }} asset from ${{ env.branch_name }}
         uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
         env:
@@ -98,6 +102,17 @@ jobs:
           workflow_conclusion: success
           branch: ${{ env.branch_name }}
           artifacts: ${{ matrix.name }}.zip
+          path: publish
+
+      - name: Zip extracted artifact
+        run: |
+          cd publish
+          zip -r ${{ matrix.name }}.zip .
+          mv ${{ matrix.name }}.zip ../
+          cd ..
+
+          pwd
+          ls -atlh
 
       - name: Login to Azure
         uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a