From 1a874b0c9da4ddb9199d021b700eb1e806dfa570 Mon Sep 17 00:00:00 2001
From: sunny-sidhu-and <97452339+sunny-sidhu-and@users.noreply.github.com>
Date: Tue, 25 Jul 2023 13:20:53 +0100
Subject: [PATCH] ER-698: Revert deploy steps (#737)

Co-authored-by: Sunny Sidhu <ssidhu@and.digital>
---
 .github/workflows/azure-deploy-dev.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/azure-deploy-dev.yml b/.github/workflows/azure-deploy-dev.yml
index 50b3babb3..ce55ea971 100644
--- a/.github/workflows/azure-deploy-dev.yml
+++ b/.github/workflows/azure-deploy-dev.yml
@@ -40,13 +40,11 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v3
 
-      # Login to Azure using OIDC
-      - name: Login to Azure CLI
-        uses: azure/login@v1
+      # Create and boot Docker image builder
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
         with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          version: v0.9.1
 
       # Login to the container registry
       - name: Login to Github Container Registry
@@ -56,12 +54,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Create and boot Docker image builder
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: v0.9.1
-
       # Build and push image
       - name: Build and push Docker Image
         uses: docker/build-push-action@v4
@@ -78,6 +70,14 @@ jobs:
             ${{ env.DOCKER_IMAGE }}:${{ github.sha }}
             ${{ env.DOCKER_IMAGE }}:latest
 
+      # Login to Azure using OIDC
+      - name: Login to Azure CLI
+        uses: azure/login@v1
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
       # Deploy Web Application
       - name: Deploy to Azure App Services
         uses: azure/webapps-deploy@v2
@@ -92,4 +92,4 @@ jobs:
           resource-group: ${{ secrets.AZURE_RESOURCE_GROUP }}
           image: ${{ env.DOCKER_IMAGE }}:${{ github.sha }}
           name: eyrecovery-worker
-          location: 'west europe'
+          location: 'west europe'
\ No newline at end of file