From 06e8f9e337453f8068145d23e81119be841786cf Mon Sep 17 00:00:00 2001
From: Steve Smodish <stevesmodish@gmail.com>
Date: Fri, 26 Jul 2024 15:01:24 -0400
Subject: [PATCH] Update main_mango-entertainment-api.yml

Another try at getting this deployed.
---
 .../main_mango-entertainment-api.yml          | 30 ++++---------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/main_mango-entertainment-api.yml b/.github/workflows/main_mango-entertainment-api.yml
index f811a6e..02a8216 100644
--- a/.github/workflows/main_mango-entertainment-api.yml
+++ b/.github/workflows/main_mango-entertainment-api.yml
@@ -12,7 +12,7 @@ env:
   WORKING_DIRECTORY: ./base-api
 
 jobs:
-  build:
+  build-and-deploy:
     runs-on: ubuntu-latest
 
     steps:
@@ -35,37 +35,17 @@ jobs:
         run: dotnet publish -c Release -o ${{github.workspace}}/publish
         working-directory: ${{ env.WORKING_DIRECTORY }}
 
-      - name: Upload artifact for deployment job
-        uses: actions/upload-artifact@v4
-        with:
-          name: .net-app
-          path: ${{github.workspace}}/publish
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    environment:
-      name: 'Production'
-      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
-
-    steps:
-      - name: Download artifact from build job
-        uses: actions/download-artifact@v4
-        with:
-          name: .net-app
-
       - name: Login to Azure
         uses: azure/login@v1
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
 
       - name: Deploy to Azure Web App
-        id: deploy-to-webapp
         uses: azure/webapps-deploy@v3
         with:
           app-name: ${{ env.AZURE_WEBAPP_NAME }}
-          package: .
+          package: ${{github.workspace}}/publish
 
-      - name: logout
-        run: |
-          az logout
+      - name: Azure CLI logout
+        run: az logout
+        if: always()