From f1d3557cc1a06f31f31235dc2778a3b0339102e4 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 9 Feb 2025 12:54:41 +0900
Subject: [PATCH 1/4] =?UTF-8?q?CLAP-338=20Feat:=20=EB=A6=B4=EB=A6=AC?=
 =?UTF-8?q?=EC=A6=88=20cd=20github=20actions=20=EC=9B=8C=ED=81=AC=ED=94=8C?=
 =?UTF-8?q?=EB=A1=9C=EC=9A=B0=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #433
---
 .github/workflows/dev-cd.yml | 40 ++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml
index ababe2a1..3965710f 100644
--- a/.github/workflows/dev-cd.yml
+++ b/.github/workflows/dev-cd.yml
@@ -1,27 +1,29 @@
 # github repository actions 페이지에 나타날 이름
-name: CD to dev using github actions
+name: CD for Release
 
 # event trigger
-# develop 브랜치에 pull_request가 닫혔을 때 실행
 on:
-  pull_request:
-    types: [ closed ]
-    branches: [ "develop" ]
+  release:
+    types: [created]
 
 permissions:
   contents: read
 
 jobs:
-  DEV-CD:
-    if: github.event.pull_request.merged == true
+  Release-CD:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: 'Set up jdk'
+
+      - name: 'Set up JDK'
         uses: actions/setup-java@v3
         with:
           java-version: '17'
-          distribution: 'temurin' # https://github.com/actions/setup-java
+          distribution: 'temurin'
+
+      - name: Extract release version
+        id: version
+        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
       - run: touch ./Dockerfile
       - run: echo "${{ secrets.DEV_DOCKERFILE }}" > ./Dockerfile
@@ -37,21 +39,22 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      ## gradle build
+      # 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
+      # docker build & push
+      - name: Docker build & push
         run: |
           docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker build -t ${{ secrets.DOCKER_REPO }} .
-          docker push ${{ secrets.DOCKER_REPO }}
+          docker build -t ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }} -t ${{ secrets.DOCKER_REPO }}:latest .
+          docker push ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }}
+          docker push ${{ secrets.DOCKER_REPO }}:latest
 
-        ## deploy to dev
-      - name: Deploy to prod
+      # deploy
+      - name: Deploy
         uses: appleboy/ssh-action@master
         id: deploy
         with:
@@ -61,8 +64,9 @@ jobs:
           port: ${{ secrets.DEV_HOST_PORT }}
           script: |
             docker rm -f taskflow
-            docker image rm ${{ secrets.DOCKER_REPO }} -f
+            docker image rm ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }} -f
             docker run --name taskflow -d -p 9090:9090 \
               --env-file /home/ubuntu/.env \
-              ${{ secrets.DOCKER_REPO }} \
+              ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }} \
               --restart on-failure
+

From 126b65c08718486dbb32b9275486188ca6d26b3a Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 10 Feb 2025 10:00:13 +0900
Subject: [PATCH 2/4] =?UTF-8?q?CLAP-338=20chore=20:=20develop=20cd=20?=
 =?UTF-8?q?=EB=B0=8F=20release=20cd=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #433
---
 .github/workflows/dev-cd.yml     | 42 +++++++++----------
 .github/workflows/release-cd.yml | 72 ++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 23 deletions(-)
 create mode 100644 .github/workflows/release-cd.yml

diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml
index 3965710f..2975ba26 100644
--- a/.github/workflows/dev-cd.yml
+++ b/.github/workflows/dev-cd.yml
@@ -1,29 +1,27 @@
 # github repository actions 페이지에 나타날 이름
-name: CD for Release
+name: CD to dev using github actions
 
 # event trigger
+# develop 브랜치에 pull_request가 닫혔을 때 실행
 on:
-  release:
-    types: [created]
+  pull_request:
+    types: [ closed ]
+    branches: [ "develop" ]
 
 permissions:
   contents: read
 
 jobs:
-  Release-CD:
+  DEV-CD:
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
-      - name: 'Set up JDK'
+      - name: 'Set up jdk'
         uses: actions/setup-java@v3
         with:
           java-version: '17'
-          distribution: 'temurin'
-
-      - name: Extract release version
-        id: version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          distribution: 'temurin' # https://github.com/actions/setup-java
 
       - run: touch ./Dockerfile
       - run: echo "${{ secrets.DEV_DOCKERFILE }}" > ./Dockerfile
@@ -39,22 +37,21 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      # gradle build
+      ## gradle build
       - name: Build with Gradle
         run: |
           chmod +x ./gradlew
           ./gradlew build -x test
 
-      # docker build & push
-      - name: Docker build & push
+        ## docker build & push to production
+      - name: Docker build & push to dev
         run: |
           docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker build -t ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }} -t ${{ secrets.DOCKER_REPO }}:latest .
-          docker push ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }}
-          docker push ${{ secrets.DOCKER_REPO }}:latest
+          docker build -t ${{ secrets.DOCKER_REPO }} .
+          docker push ${{ secrets.DOCKER_REPO }}
 
-      # deploy
-      - name: Deploy
+        ## deploy to dev
+      - name: Deploy to prod
         uses: appleboy/ssh-action@master
         id: deploy
         with:
@@ -64,9 +61,8 @@ jobs:
           port: ${{ secrets.DEV_HOST_PORT }}
           script: |
             docker rm -f taskflow
-            docker image rm ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }} -f
+            docker image rm ${{ secrets.DOCKER_REPO }} -f
             docker run --name taskflow -d -p 9090:9090 \
               --env-file /home/ubuntu/.env \
-              ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }} \
-              --restart on-failure
-
+              ${{ secrets.DOCKER_REPO }} \
+              --restart on-failure
\ No newline at end of file
diff --git a/.github/workflows/release-cd.yml b/.github/workflows/release-cd.yml
new file mode 100644
index 00000000..3965710f
--- /dev/null
+++ b/.github/workflows/release-cd.yml
@@ -0,0 +1,72 @@
+# github repository actions 페이지에 나타날 이름
+name: CD for Release
+
+# event trigger
+on:
+  release:
+    types: [created]
+
+permissions:
+  contents: read
+
+jobs:
+  Release-CD:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: 'Set up JDK'
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Extract release version
+        id: version
+        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+
+      - 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
+      - name: Docker build & push
+        run: |
+          docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -t ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }} -t ${{ secrets.DOCKER_REPO }}:latest .
+          docker push ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }}
+          docker push ${{ secrets.DOCKER_REPO }}:latest
+
+      # deploy
+      - name: Deploy
+        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 }}:${{ steps.version.outputs.VERSION }} -f
+            docker run --name taskflow -d -p 9090:9090 \
+              --env-file /home/ubuntu/.env \
+              ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }} \
+              --restart on-failure
+

From a048076b263e61705d7ddba8808be5a5bac429ca Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 10 Feb 2025 10:00:30 +0900
Subject: [PATCH 3/4] =?UTF-8?q?CLAP-338=20chore=20:=20release=20ci=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #433
---
 .github/workflows/{dev-ci.yml => ci.yml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename .github/workflows/{dev-ci.yml => ci.yml} (96%)

diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/ci.yml
similarity index 96%
rename from .github/workflows/dev-ci.yml
rename to .github/workflows/ci.yml
index 22dd4a9f..3c0fd3e9 100644
--- a/.github/workflows/dev-ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ name: CI for dev using github actions
 on:
   pull_request:
     types: [opened, synchronize]
-    branches: [ "develop" ]
+    branches: [ "develop", "release" ]
 
 permissions:
   contents: read

From aa4345b97ede46d9e9aee937cbeee9176ee3ff2f Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 10 Feb 2025 10:00:41 +0900
Subject: [PATCH 4/4] =?UTF-8?q?CLAP-338=20chore=20:=20=EB=B2=84=EA=B7=B8?=
 =?UTF-8?q?=20=EC=9D=B4=EC=8A=88=20release=20=EA=B8=B0=EC=A4=80=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #433
---
 .github/workflows/create-jira-bug-issue.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/create-jira-bug-issue.yml b/.github/workflows/create-jira-bug-issue.yml
index 7135dbb1..0f569bda 100644
--- a/.github/workflows/create-jira-bug-issue.yml
+++ b/.github/workflows/create-jira-bug-issue.yml
@@ -74,10 +74,10 @@ jobs:
       - name: Log created issue
         run: echo "Jira Issue ${{ steps.issue-parser.outputs.parentKey }}/${{ steps.create.outputs.issue }} was created"
 
-      - name: Checkout develop code
+      - name: Checkout release code
         uses: actions/checkout@v4
         with:
-          ref: develop
+          ref: release
           token: ${{ secrets.PAT_TOKEN }}
 
       - name: Create branch with Ticket number