From ee2baad41a72b644e540b63f2d90ecff577199f2 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 23 Jan 2025 13:13:24 +0900
Subject: [PATCH] =?UTF-8?q?CLAP-104=20CI/CD=20:=20=EA=B9=83=ED=97=88?=
 =?UTF-8?q?=EB=B8=8C=EC=95=A1=EC=85=98=20dev=20=ED=99=98=EA=B2=BD=20ci/cd?=
 =?UTF-8?q?=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EB=8B=A4=EC=8B=9C=20?=
 =?UTF-8?q?=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #55
---
 .github/workflows/dev-cd.yml | 109 +++++++++++++++++++++--------------
 .github/workflows/dev-ci.yml |  41 +------------
 2 files changed, 67 insertions(+), 83 deletions(-)

diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml
index 6cd7ea80..b90f1aab 100644
--- a/.github/workflows/dev-cd.yml
+++ b/.github/workflows/dev-cd.yml
@@ -1,44 +1,65 @@
-## github repository actions 페이지에 나타날 이름
-#name: CD to dev using github actions
-#
-## event trigger
-## develop 브랜치에 pull_request가 닫혔을 때 실행
-#on:
-#  pull_request:
-#    types: [ closed ]
-#    branches: [ "develop" ]
-#
-#permissions:
-#  contents: read
-#
-#jobs:
-#  DEV-CD:
-#    if: github.event.pull_request.merged == true
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Download build artifacts
-#        uses: actions/download-artifact@v4
-#        with:
-#          name: build-artifacts
-#          github-token: ${{ secrets.GH_TOKEN }}
-#
-#        ## docker build & push to production
-#      - name: Docker build & push to prod
-#        run: |
-#          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-#          docker build -t ${{ secrets.DOCKER_REPO }} .
-#          docker push ${{ secrets.DOCKER_REPO }}
-#
-#        ## deploy to dev
-#      - name: Deploy to prod
-#        uses: appleboy/ssh-action@master
-#        id: deploy
-#        with:
-#          host: ${{ secrets.DEV_HOST }}
-#          username: ${{ secrets.DEV_HOST_USERNAME }}
-#          key: ${{ secrets.DEV_HOST_KEY }}
-#          port: ${{ secrets.DEV_HOST_PORT }}
-#          script: |
-#            docker rm -f taskflow
-#            docker image rm ${{ secrets.DOCKER_REPO }} -f
-#            docker run --name taskflow --network host -d -p 8080:8080 ${{ secrets.DOCKER_REPO }} --restart on-failure
\ No newline at end of file
+# github repository actions 페이지에 나타날 이름
+name: CD to dev using github actions
+
+# event trigger
+# develop 브랜치에 pull_request가 닫혔을 때 실행
+on:
+  pull_request:
+    types: [ closed ]
+    branches: [ "develop" ]
+
+permissions:
+  contents: read
+
+jobs:
+  DEV-CD:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: 'Set up jdk'
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin' # https://github.com/actions/setup-java
+
+      - run: touch ./Dockerfile
+      - run: echo "${{ secrets.DEV_DOCKERFILE }}" > ./Dockerfile
+
+      # gradle caching - 빌드 시간 향상
+      - name: Gradle Caching
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      ## gradle build
+      - name: Build with Gradle
+        run: |
+          chmod +x ./gradlew
+          ./gradlew build -x test
+
+        ## docker build & push to production
+      - name: Docker build & push to dev
+        run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -t ${{ secrets.DOCKER_REPO }} .
+          docker push ${{ secrets.DOCKER_REPO }}
+
+        ## deploy to dev
+      - name: Deploy to prod
+        uses: appleboy/ssh-action@master
+        id: deploy
+        with:
+          host: ${{ secrets.DEV_HOST }}
+          username: ${{ secrets.DEV_HOST_USERNAME }}
+          key: ${{ secrets.DEV_HOST_KEY }}
+          port: ${{ secrets.DEV_HOST_PORT }}
+          script: |
+            docker rm -f taskflow
+            docker image rm ${{ secrets.DOCKER_REPO }} -f
+            docker run --name taskflow --network host -d -p 8080:8080 ${{ secrets.DOCKER_REPO }} --restart on-failure
\ No newline at end of file
diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
index 5034f91b..6d89c9bc 100644
--- a/.github/workflows/dev-ci.yml
+++ b/.github/workflows/dev-ci.yml
@@ -1,11 +1,11 @@
 # github repository actions 페이지에 나타날 이름
-name: CI/CD to dev using github actions
+name: CI for dev using github actions
 
 # event trigger
 # develop 브랜치에 pull_request가 열렸을 때 실행
 on:
   pull_request:
-    types: [opened, synchronize, closed]
+    types: [opened, synchronize]
     branches: [ "develop" ]
 
 permissions:
@@ -23,9 +23,6 @@ jobs:
           java-version: '17'
           distribution: 'temurin' # https://github.com/actions/setup-java
 
-      - run: touch ./Dockerfile
-      - run: echo "${{ secrets.DEV_DOCKERFILE }}" > ./Dockerfile
-
       # gradle caching - 빌드 시간 향상
       - name: Gradle Caching
         uses: actions/cache@v4
@@ -42,37 +39,3 @@ jobs:
         run: |
           chmod +x ./gradlew
           ./gradlew build
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-artifacts
-          path: build/libs/*.jar
-
-  DEV-CD:
-    if: github.event.action == 'closed' && github.event.pull_request.merged == true
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download build artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: build-artifacts
-          github-token: ${{ secrets.GH_TOKEN }}
-
-      - name: Docker build & push to prod
-        run: |
-          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker build -t ${{ secrets.DOCKER_REPO }} .
-          docker push ${{ secrets.DOCKER_REPO }}
-
-      - name: Deploy to dev
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.DEV_HOST }}
-          username: ${{ secrets.DEV_HOST_USERNAME }}
-          key: ${{ secrets.DEV_HOST_KEY }}
-          port: ${{ secrets.DEV_HOST_PORT }}
-          script: |
-            docker rm -f taskflow || true
-            docker image rm ${{ secrets.DOCKER_REPO }} -f || true
-            docker run --name taskflow --network host -d -p 8080:8080 ${{ secrets.DOCKER_REPO }} --restart on-failure
\ No newline at end of file