From afe1d917bee24fcf2b848b6e44be73b0a25aa768 Mon Sep 17 00:00:00 2001
From: meysamhadeli <meysamhadeli@gmail.com>
Date: Thu, 26 Jan 2023 02:13:37 +0330
Subject: [PATCH] refactor

---
 .github/workflows/ci.yml | 49 ++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c1287a0..03aac82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,29 +17,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Update Release Drafter
-        if: github.ref == 'refs/heads/main'
-        id: last_release
-        uses: release-drafter/release-drafter@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: "Print result"
-        run: |
-          echo "tag_name: ${{ steps.last_release.outputs.tag_name }}"
-          echo "name: ${{ steps.last_release.outputs.name }}"
-          echo "id: ${{ steps.last_release.outputs.id }}"
-          echo "branch: ${{ github.ref }}"
-          echo "branch: ${{ github.ref }}"
-
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        if: ${{ success() && steps.last_release.outputs.tag_name != '' }}
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
       - name: Setup .NET
         uses: actions/setup-dotnet@v2
         with:
@@ -59,16 +36,27 @@ jobs:
         run: dotnet build -c Release --no-restore
 
       - name: Test
-        if: ${{success()}}
         run: dotnet test -c Release --no-restore
 
+      - name: Update Release Drafter
+        if: github.ref == 'refs/heads/main'
+        id: last_release
+        uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        if: ${{ github.ref == 'refs/heads/main' && success() && steps.last_release.outputs.tag_name != '' }}
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
       ##ref: https://docs.docker.com/language/golang/configure-ci-cd/
       ##ref: https://event-driven.io/en/how_to_buid_and_push_docker_image_with_github_actions
       - name: Build Docker Image
-        if: |
-          ${{github.ref == 'refs/heads/main'}} &&
-          ${{success()}} &&
-          ${{ steps.last_release.outputs.tag_name }} != ''
+        if: ${{ github.ref == 'refs/heads/main' && success() && steps.last_release.outputs.tag_name != '' }}
         run: |
           docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-flight:${{ steps.last_release.outputs.tag_name }} -f "${{ github.workspace }}/src/Services/Flight/Dockerfile" .
           docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-identity:${{ steps.last_release.outputs.tag_name }} -f "${{ github.workspace }}/src/Services/Identity/Dockerfile" .
@@ -76,10 +64,7 @@ jobs:
           docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-booking:${{ steps.last_release.outputs.tag_name }} -f "${{ github.workspace }}/src/Services/Booking/Dockerfile" .
 
       - name: Publish Docker Image
-        if: |
-          ${{github.ref == 'refs/heads/main'}} &&
-          ${{success()}} &&
-          ${{ steps.last_release.outputs.tag_name }} != ''
+        if: ${{ github.ref == 'refs/heads/main' && success() && steps.last_release.outputs.tag_name != '' }}
         run: |
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-flight:${{ steps.last_release.outputs.tag_name }}
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-identity:${{ steps.last_release.outputs.tag_name }}