Merge branch 'testcases-branch' into UT-10888-backend

Author: Harmanpreet-Microsoft

.github/workflows/docker-build-and-push.yml

@@ -32,24 +32,27 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Log in to Azure Container Registry
+
         uses: azure/docker-login@v2
         with:
           login-server: ${{ secrets.ACR_LOGIN_SERVER }}
           username: ${{ secrets.ACR_USERNAME }}
           password: ${{ secrets.ACR_PASSWORD }}
 
+
       - name: Set Docker image tag
         run: |
-          if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
+          if [[ "${{ github.head.ref }}" == "main" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
+          elif [[ "${{ github.head.ref }}" == "dev" ]]; then
             echo "TAG=dev" >> $GITHUB_ENV
-          elif [[ "${{ github.ref }}" == "refs/heads/demo" ]]; then
+          elif [[ "${{ github.head.ref }}" == "demo" ]]; then
             echo "TAG=demo" >> $GITHUB_ENV
-          elif [[ "${{ github.ref }}" == "refs/heads/hotfix" ]]; then
+          elif [[ "${{ github.head.ref }}" == "hotfix" ]]; then
             echo "TAG=hotfix" >> $GITHUB_ENV
           fi
       - name: Build and push Docker images
+
         run: |
           cd src/backend
           docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/macaebackend:${{ env.TAG }} -f Dockerfile . && \
@@ -59,4 +62,5 @@ jobs:
           docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/macaefrontend:${{ env.TAG }} -f Dockerfile . && \
           docker push ${{ secrets.ACR_LOGIN_SERVER }}/macaefrontend:${{ env.TAG }} && \
           echo "Frontend image built and pushed successfully."
+