From c7eb673cd762f48a93ff2bf48f6a6abde6747e2e Mon Sep 17 00:00:00 2001 From: belljun3395 <195850@jnu.ac.kr> Date: Fri, 13 Dec 2024 17:19:18 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20api=20=EB=AA=A8=EB=93=88=EC=97=90?= =?UTF-8?q?=EC=84=9C=EB=A7=8C=20openapi3=20=ED=85=8C=EC=8A=A4=ED=81=AC=20?= =?UTF-8?q?=EC=88=98=ED=96=89=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/code-ci.yml | 4 ++-- .github/workflows/ecs-cd.yml | 4 ++-- .github/workflows/ecs-dev-cd.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/code-ci.yml b/.github/workflows/code-ci.yml index c3a7a22e1..c16864ad1 100644 --- a/.github/workflows/code-ci.yml +++ b/.github/workflows/code-ci.yml @@ -48,11 +48,11 @@ jobs: - 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..db6c16d13 100644 --- a/.github/workflows/ecs-cd.yml +++ b/.github/workflows/ecs-cd.yml @@ -62,11 +62,11 @@ jobs: - 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..170cc15c6 100644 --- a/.github/workflows/ecs-dev-cd.yml +++ b/.github/workflows/ecs-dev-cd.yml @@ -62,11 +62,11 @@ jobs: - 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: From 304e24303bce748900742a5552db193d49d1cfdc Mon Sep 17 00:00:00 2001 From: belljun3395 <195850@jnu.ac.kr> Date: Fri, 13 Dec 2024 17:20:31 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20test=20step=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/code-ci.yml | 4 ---- .github/workflows/ecs-cd.yml | 4 ---- .github/workflows/ecs-dev-cd.yml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/.github/workflows/code-ci.yml b/.github/workflows/code-ci.yml index c16864ad1..1fe2f9da3 100644 --- a/.github/workflows/code-ci.yml +++ b/.github/workflows/code-ci.yml @@ -38,10 +38,6 @@ jobs: run: | ./gradlew jooqCodegenAll - - name: Test with Gradle - run: | - ./gradlew test -parallel - - name: Build with Gradle run: | ./gradlew api:build -x test diff --git a/.github/workflows/ecs-cd.yml b/.github/workflows/ecs-cd.yml index db6c16d13..fa6352703 100644 --- a/.github/workflows/ecs-cd.yml +++ b/.github/workflows/ecs-cd.yml @@ -56,10 +56,6 @@ jobs: run: | ./gradlew jooqCodegenAll - - name: Test with Gradle - run: | - ./gradlew test -parallel - - name: Generate OpenAPI3 run: | ./gradlew api:openapi3 -PserverUrl=https://api.fewletter.site diff --git a/.github/workflows/ecs-dev-cd.yml b/.github/workflows/ecs-dev-cd.yml index 170cc15c6..77cefbb5d 100644 --- a/.github/workflows/ecs-dev-cd.yml +++ b/.github/workflows/ecs-dev-cd.yml @@ -56,10 +56,6 @@ jobs: run: | ./gradlew jooqCodegenAll - - name: Test with Gradle - run: | - ./gradlew test -parallel - - name: Generate OpenAPI3 run: | ./gradlew api:openapi3 -PserverUrl=https://api.fewletter.shop From 34a3ce926a815c3ca05072488b0bfbb2c3fd6955 Mon Sep 17 00:00:00 2001 From: belljun3395 <195850@jnu.ac.kr> Date: Fri, 13 Dec 2024 17:21:13 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20java=20=EB=B2=84=EC=A0=84=2018?= =?UTF-8?q?=EC=9C=BC=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 --- .github/workflows/code-ci.yml | 4 ++-- .github/workflows/ecs-cd.yml | 4 ++-- .github/workflows/ecs-dev-cd.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/code-ci.yml b/.github/workflows/code-ci.yml index 1fe2f9da3..dbc8c3d68 100644 --- a/.github/workflows/code-ci.yml +++ b/.github/workflows/code-ci.yml @@ -28,10 +28,10 @@ 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 diff --git a/.github/workflows/ecs-cd.yml b/.github/workflows/ecs-cd.yml index fa6352703..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 diff --git a/.github/workflows/ecs-dev-cd.yml b/.github/workflows/ecs-dev-cd.yml index 77cefbb5d..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