From c45a11074230e33b0ea593f12860e89b18c72274 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 23 Jan 2025 12:54:13 +0900
Subject: [PATCH 1/2] =?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=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #55
---
 .github/workflows/dev-cd.yml | 1 +
 .github/workflows/dev-ci.yml | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml
index aed861b5..3514bec4 100644
--- a/.github/workflows/dev-cd.yml
+++ b/.github/workflows/dev-cd.yml
@@ -20,6 +20,7 @@ jobs:
         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
diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
index 2abf0f3e..51faf1fb 100644
--- a/.github/workflows/dev-ci.yml
+++ b/.github/workflows/dev-ci.yml
@@ -1,5 +1,5 @@
 # github repository actions 페이지에 나타날 이름
-name: CI/CD using github actions
+name: CI for dev using github actions
 
 # event trigger
 # develop 브랜치에 pull_request가 열렸을 때 실행
@@ -12,7 +12,7 @@ permissions:
   contents: read
 
 jobs:
-  CI:
+  DEV_CI:
     if: github.event.action == 'opened' || github.event.action == 'synchronize'
     runs-on: ubuntu-latest
     steps:
@@ -28,7 +28,7 @@ jobs:
 
       # gradle caching - 빌드 시간 향상
       - name: Gradle Caching
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches

From e760844de58a00909bf8560aaa8fc8250e137d39 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 23 Jan 2025 13:06:25 +0900
Subject: [PATCH 2/2] =?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=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #55
---
 .github/workflows/dev-cd.yml | 88 ++++++++++++++++++------------------
 .github/workflows/dev-ci.yml | 32 ++++++++++++-
 2 files changed, 74 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml
index 3514bec4..6cd7ea80 100644
--- a/.github/workflows/dev-cd.yml
+++ b/.github/workflows/dev-cd.yml
@@ -1,44 +1,44 @@
-# 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:
+#      - 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
diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
index 51faf1fb..5034f91b 100644
--- a/.github/workflows/dev-ci.yml
+++ b/.github/workflows/dev-ci.yml
@@ -1,5 +1,5 @@
 # github repository actions 페이지에 나타날 이름
-name: CI for dev using github actions
+name: CI/CD to dev using github actions
 
 # event trigger
 # develop 브랜치에 pull_request가 열렸을 때 실행
@@ -47,4 +47,32 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
-          path: build/libs/*.jar
\ No newline at end of file
+          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