From 4dc30c9d639401a6388730d71c467b7f29eb602d Mon Sep 17 00:00:00 2001
From: belljun3395 <195850@jnu.ac.kr>
Date: Fri, 13 Dec 2024 17:23:20 +0900
Subject: [PATCH] =?UTF-8?q?[Fix/#442]=20CD=20=EC=95=A1=EC=85=98=20?=
 =?UTF-8?q?=EC=8B=A4=ED=8C=A8=20=EC=88=98=EC=A0=95=20(#444)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: api 모듈에서만 openapi3 테스크 수행하도록 수정

* fix: test step 제거

* fix: java 버전 18으로 수정
---
 .github/workflows/code-ci.yml    | 12 ++++--------
 .github/workflows/ecs-cd.yml     | 12 ++++--------
 .github/workflows/ecs-dev-cd.yml | 12 ++++--------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/code-ci.yml b/.github/workflows/code-ci.yml
index c3a7a22e1..dbc8c3d68 100644
--- a/.github/workflows/code-ci.yml
+++ b/.github/workflows/code-ci.yml
@@ -28,31 +28,27 @@ jobs:
                   restore-keys: |
                       ${{ runner.os }}-gradle-
 
-            - name: Set up JDK 17
+            - name: Set up JDK 18
               uses: actions/setup-java@v3
               with:
-                  java-version: '17'
+                  java-version: '18'
                   distribution: 'temurin'
 
             - name: Jooq Code Generation
               run: |
                   ./gradlew  jooqCodegenAll
 
-            - name: Test with Gradle
-              run: |
-                  ./gradlew test -parallel
-
             - name: Build with Gradle
               run: |
                   ./gradlew  api:build -x test
 
             - name: Generate OpenAPI3
               run: |
-                  ./gradlew  openapi3 -PserverUrl=https://api.fewletter.site
+                  ./gradlew api:openapi3 -PserverUrl=https://api.fewletter.site
 
             - name: Generate Swagger
               run: |
-                  ./gradlew  generateStaticSwaggerUI
+                  ./gradlew api:generateStaticSwaggerUI
 
             - name : Docker Login
               run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
diff --git a/.github/workflows/ecs-cd.yml b/.github/workflows/ecs-cd.yml
index ca05a41f7..41471be8d 100644
--- a/.github/workflows/ecs-cd.yml
+++ b/.github/workflows/ecs-cd.yml
@@ -31,11 +31,11 @@ jobs:
                   restore-keys: |
                       ${{ runner.os }}-gradle-
 
-            - name: Set up JDK 17
+            - name: Set up JDK 18
               uses: actions/setup-java@v3
               with:
+                  java-version: '18'
                   distribution: 'temurin'
-                  java-version: '17'
                   cache: gradle
 
             - name: Configure AWS credentials
@@ -56,17 +56,13 @@ jobs:
               run: |
                   ./gradlew jooqCodegenAll
 
-            - name: Test with Gradle
-              run: |
-                  ./gradlew test -parallel
-
             - name: Generate OpenAPI3
               run: |
-                  ./gradlew  openapi3 -PserverUrl=https://api.fewletter.site
+                  ./gradlew api:openapi3 -PserverUrl=https://api.fewletter.site
 
             - name: Generate Swagger
               run: |
-                  ./gradlew  generateStaticSwaggerUI
+                  ./gradlew api:generateStaticSwaggerUI
 
             - name: Build with Gradle bootBuildImage, tag, and push image to Amazon ECR
               env:
diff --git a/.github/workflows/ecs-dev-cd.yml b/.github/workflows/ecs-dev-cd.yml
index 498a2920a..d8a59751a 100644
--- a/.github/workflows/ecs-dev-cd.yml
+++ b/.github/workflows/ecs-dev-cd.yml
@@ -31,11 +31,11 @@ jobs:
                   restore-keys: |
                       ${{ runner.os }}-gradle-
 
-            - name: Set up JDK 17
+            - name: Set up JDK 18
               uses: actions/setup-java@v3
               with:
+                  java-version: '18'
                   distribution: 'temurin'
-                  java-version: '17'
                   cache: gradle
 
             - name: Configure AWS credentials
@@ -56,17 +56,13 @@ jobs:
               run: |
                   ./gradlew jooqCodegenAll
 
-            - name: Test with Gradle
-              run: |
-                  ./gradlew test -parallel
-
             - name: Generate OpenAPI3
               run: |
-                  ./gradlew  openapi3 -PserverUrl=https://api.fewletter.shop
+                  ./gradlew api:openapi3 -PserverUrl=https://api.fewletter.shop
 
             - name: Generate Swagger
               run: |
-                  ./gradlew  generateStaticSwaggerUI
+                  ./gradlew api:generateStaticSwaggerUI
 
             - name: Build with Gradle bootBuildImage, tag, and push image to Amazon ECR
               env: