From 52d1bade06ee3f25964983b28331ba7c2535acb1 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com>
Date: Wed, 27 Oct 2021 08:45:33 -0700
Subject: [PATCH] Hotfix/release workflow (#1671)

* fixing release workflow app service deploys

* adding the release branch as a conditional to the docker-stub build

* Add in missing 'if' statement for 'release' branch in Docker Stub step

Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com>
---
 .github/workflows/build.yml   | 6 ++++--
 .github/workflows/release.yml | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 366b7632a7..06c330fc8a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -371,10 +371,12 @@ jobs:
         run: dotnet tool restore
 
       - name: Make Docker stub
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/release'
         run: |
           if [[ "${{ github.ref }}" == "rc" ]]; then
             SETUP_IMAGE="bitwarden/setup:rc"
+          elif [[ "${{ github.ref }}" == "release" ]]; then
+            SETUP_IMAGE="bitwarden/setup:latest"
           else
             SETUP_IMAGE="bitwarden/setup:dev"
           fi
@@ -389,7 +391,7 @@ jobs:
           cd docker-stub; zip -r ../docker-stub.zip *; cd ..
 
       - name: Upload Docker stub artifact
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/release'
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: docker-stub.zip
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e0eab1d30f..5d132d3f9f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -90,13 +90,21 @@ jobs:
               --name appservices-${{ steps.setup.outputs.name_lower }}-webapp-name \
               --query value --output tsv
           )
+          publish_profile=$(
+            az keyvault secret show --vault-name $VAULT_NAME \
+              --name appservices-${{ steps.setup.outputs.name_lower }}-webapp-publish-profile \
+              --query value --output tsv
+          )
           echo "::add-mask::$webapp_name"
           echo "::set-output name=webapp-name::$webapp_name"
+          echo "::add-mask::$publish_profile"
+          echo "::set-output name=publish-profile::$publish_profile"
 
       - name: Deploy App
         uses: azure/webapps-deploy@798e43877120eda6a2a690a4f212c545e586ae31
         with:
           app-name: ${{ steps.retrieve-secrets.outputs.webapp-name }}
+          publish-profile: ${{ steps.retrieve-secrets.outputs.publish-profile }}
           package: ./${{ matrix.name }}.zip
           slot-name: "staging"