From 25f631b4bf28eb960bc9f3d648cefe551db79161 Mon Sep 17 00:00:00 2001
From: Hwangbo <ghkdqhrbals@naver.com>
Date: Sun, 17 Mar 2024 17:15:50 +0900
Subject: [PATCH 1/4] dev: change build to clean test

---
 .github/workflows/gradle-ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-ci.yaml b/.github/workflows/gradle-ci.yaml
index 1d352680..0465ef7a 100644
--- a/.github/workflows/gradle-ci.yaml
+++ b/.github/workflows/gradle-ci.yaml
@@ -31,7 +31,7 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Build and test project
-        run: ./gradlew build
+        run: ./gradlew clean test
 
       - name: Comment jacoco test coverage to pull request
         id: jacoco

From 95604d5db20425f9fdae166cfc16c91639bc9412 Mon Sep 17 00:00:00 2001
From: Hwangbo <ghkdqhrbals@naver.com>
Date: Sun, 17 Mar 2024 17:16:15 +0900
Subject: [PATCH 2/4] dev: setup if state

---
 .github/workflows/deploy.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 6b5c851c..ad0e2b21 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -2,7 +2,7 @@ name: Continuous Deploy with GKE
 
 on:
   workflow_run:
-    workflows: [ "CI with test coverage" ]
+    workflows: [CI with test coverage]
     types:
       - completed
     branches:
@@ -15,6 +15,7 @@ defaults:
 jobs:
   docker:
     runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4

From 265d283319287788fc1fb1a6b4d3ae37f6313648 Mon Sep 17 00:00:00 2001
From: Hwangbo <ghkdqhrbals@naver.com>
Date: Sun, 17 Mar 2024 17:29:32 +0900
Subject: [PATCH 3/4] chore: gke cd file name change

---
 .github/workflows/{deploy.yaml => gke-cd.yaml} | 1 +
 1 file changed, 1 insertion(+)
 rename .github/workflows/{deploy.yaml => gke-cd.yaml} (99%)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/gke-cd.yaml
similarity index 99%
rename from .github/workflows/deploy.yaml
rename to .github/workflows/gke-cd.yaml
index ad0e2b21..125bf3f3 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/gke-cd.yaml
@@ -7,6 +7,7 @@ on:
       - completed
     branches:
       - develop
+      - main
 
 defaults:
   run:

From d297a68efd3a611fd94b57d2d82751f2a5597a74 Mon Sep 17 00:00:00 2001
From: Hwangbo <ghkdqhrbals@naver.com>
Date: Sun, 17 Mar 2024 17:37:00 +0900
Subject: [PATCH 4/4] fix: remove trigger and setup duplicate workflow

---
 .github/workflows/gke-cd.yaml    | 51 ++++++++++++++++++++++++--------
 .github/workflows/gradle-ci.yaml |  1 -
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/gke-cd.yaml b/.github/workflows/gke-cd.yaml
index 125bf3f3..98870c38 100644
--- a/.github/workflows/gke-cd.yaml
+++ b/.github/workflows/gke-cd.yaml
@@ -1,12 +1,8 @@
 name: Continuous Deploy with GKE
 
 on:
-  workflow_run:
-    workflows: [CI with test coverage]
-    types:
-      - completed
+  pull_request:
     branches:
-      - develop
       - main
 
 defaults:
@@ -14,9 +10,44 @@ defaults:
     working-directory: ./
 
 jobs:
-  docker:
+  Test-Coverage-Result:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Corretto openJDK 17
+        uses: actions/setup-java@v3 # check specific version in https://github.com/actions/setup-java
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+
+      - name: Gradle caching
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x ./gradlew
+
+      - name: Build and test project
+        run: ./gradlew clean test
+
+      - name: Comment jacoco test coverage to pull request
+        id: jacoco
+        uses: madrapps/jacoco-report@v1.2
+        with:
+          title: 📝 Test code-coverage reports
+          paths: ${{ github.workspace }}/bm-controller/build/reports/jacoco/test/jacocoTestReport.xml
+          token: ${{ secrets.GITHUB_TOKEN }}
+          min-coverage-overall: 60
+          min-coverage-changed-files: 60
+          pass-emoji: ✅
+  Deploy-to-GKE:
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -43,12 +74,6 @@ jobs:
       - name: Build and test project
         run: ./gradlew build
 
-#      - name: Set up QEMU
-#        uses: docker/setup-qemu-action@v3
-#
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-
       - name: Build docker image and push
         run: bash ./script/img_push_multi_arch.sh -u ${{ secrets.DOCKERHUB_USERNAME }} -t ${{ secrets.DOCKERHUB_TOKEN }}
 
diff --git a/.github/workflows/gradle-ci.yaml b/.github/workflows/gradle-ci.yaml
index 0465ef7a..feac9303 100644
--- a/.github/workflows/gradle-ci.yaml
+++ b/.github/workflows/gradle-ci.yaml
@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - "develop**"
-      - "main"
 
 jobs:
   Test-Coverage-Result: