feat: branch name in pr comment

Author: johnnyreilly

.github/workflows/deploy.yaml

@@ -13,6 +13,7 @@ jobs:
     uses: ./.github/workflows/shared-build-and-deploy.yaml
     with:
       deploy: true
+      branchName: ${{ github.head_ref || github.ref_name }}
     secrets: inherit
 
   get-container-app-url:

.github/workflows/pull-request-action.yaml

@@ -13,10 +13,22 @@ jobs:
           GITHUB_CONTEXT: ${{ toJSON(github) }}
         run: echo "$GITHUB_CONTEXT"
 
+  get-branch-name:
+    runs-on: ubuntu-latest
+    outputs:
+      branchName: ${{ steps.get-branch-name.outputs.branchName }}
+    steps:
+      - id: get-branch-name
+        run: |
+          branchName=$(gh pr view ${{ github.event.issue.number }} --json "headRefName" --jq ".headRefName" --repo ${{ github.repository }})
+          echo "branchName=$branchName" >> $GITHUB_OUTPUT
+
   build-and-deploy:
     # check if the comment comes from a pull request and contains the required keyword
     if: contains(github.event.comment.html_url, '/pull/') && contains(github.event.comment.body, '/deploy')
+    needs: get-branch-name
     uses: ./.github/workflows/shared-build-and-deploy.yaml
     with:
       deploy: true
+      branchName: ${{ needs.get-branch-name.outputs.branchName }}
     secrets: inherit

.github/workflows/shared-build-and-deploy.yaml

@@ -6,10 +6,15 @@ on:
       deploy:
         required: true
         type: boolean
+      branchName:
+        required: true
+        type: string
+
     # secrets:
     #   personal_access_token:
     #     required: true
     # Map the workflow outputs to job outputs
+
     outputs:
       container-app-url:
         description: "The URL of the deployed container app"
@@ -18,7 +23,6 @@ on:
 env:
   RESOURCE_GROUP: rg-poorclaresarundel
   REGISTRY: ghcr.io
-  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 jobs:
   build:
@@ -101,14 +105,19 @@ jobs:
         uses: azure/CLI@v2
         with:
           inlineScript: |
-            REF_SHA="${{ env.BRANCH_NAME }}.${{ needs.build.outputs.sha-short }}"
+            BRANCH_NAME="${{ inputs.branchName }}"
+            REF_SHA="${{ inputs.branchName }}.${{ needs.build.outputs.sha-short }}"
             DEPLOYMENT_NAME="${REF_SHA////-}"
             echo "DEPLOYMENT_NAME=$DEPLOYMENT_NAME"
 
             webServiceImage="${{ needs.build.outputs.image-name }}:sha-${{ needs.build.outputs.sha-short }}"
             echo "webServiceImage=$webServiceImage"
 
-            webServiceContainerAppName='${{ env.BRANCH_NAME }}-web'
+            if [ "$BRANCH_NAME" == "main" ]; then
+              webServiceContainerAppName="main-web"
+            else
+              webServiceContainerAppName="preview-web"
+            fi
             echo "webServiceContainerAppName=$webServiceContainerAppName"
 
             TAGS='{"owner":"johnnyreilly", "email":"johnny_reilly@hotmail.com"}'
@@ -121,7 +130,7 @@ jobs:
                   containerRegistry=${{ env.REGISTRY }} \
                   containerRegistryUsername=${{ github.actor }} \
                   containerRegistryPassword=${{ secrets.PACKAGES_TOKEN }} \
-                  branchName='${{ env.BRANCH_NAME }}' \
+                  branchName="$BRANCH_NAME" \
                   workspaceName='shared-log-analytics' \
                   appInsightsName='shared-app-insights' \
                   managedEnvironmentName='shared-env' \