From 2dcc0ae6b7e77943b1a39fa7bcd940918a3a82f8 Mon Sep 17 00:00:00 2001 From: choubung Date: Tue, 18 Nov 2025 11:08:02 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20java=20=EB=B2=84=EC=A0=84=2021?= =?UTF-8?q?=EC=9D=84=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 2 +- Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 02e52d6..ed88f3b 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -26,7 +26,7 @@ jobs: with: arguments: clean build cache-disabled: true - java-version: '17' + java-version: '21' distribution: 'temurin' env: GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61eac01..86231b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: with: arguments: clean build cache-disabled: true # 캐시 오류 방지 - java-version: '17' + java-version: '21' distribution: 'temurin' env: GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} diff --git a/Dockerfile b/Dockerfile index c7b6584..3d19c24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17.0.17_10-jre-noble +FROM eclipse-temurin:21.0.9_10-jre-ubi9-minimal ARG JAR_FILE=build/libs/*.jar From c5f82ccd50b5f8655e378f50467f20a05a78337b Mon Sep 17 00:00:00 2001 From: choubung Date: Tue, 18 Nov 2025 11:16:25 +0900 Subject: [PATCH 2/4] =?UTF-8?q?build:=20java=2021=EB=A1=9C=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7033a7f..107fe23 100644 --- a/build.gradle +++ b/build.gradle @@ -9,8 +9,8 @@ version = '0.0.1-SNAPSHOT' description = 'openMission' java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } configurations { From 0d6bd439eb8eced89a5933317ce776ca00ddd4d6 Mon Sep 17 00:00:00 2001 From: choubung Date: Tue, 18 Nov 2025 11:26:23 +0900 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=EC=9E=90=EB=B0=94=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=20=EB=B3=80=EA=B2=BD=20=EC=8A=A4=ED=85=9D=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 6 ++++++ .github/workflows/ci.yml | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ed88f3b..edeb8e5 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -20,6 +20,12 @@ jobs: - name: Run chmod to make gradlew executable run: chmod +x ./gradlew + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + # 테스트와 빌드를 실행 - name: Build with Gradle uses: gradle/gradle-build-action@v3 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86231b2..5ae8380 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,13 +20,17 @@ jobs: - name: Run chmod to make gradlew executable run: chmod +x ./gradlew + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + - name: Build with Gradle (and run tests) uses: gradle/gradle-build-action@v3 with: arguments: clean build cache-disabled: true # 캐시 오류 방지 - java-version: '21' - distribution: 'temurin' env: GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} \ No newline at end of file From 45fb97287be653d776e40a0b472fbc7fe5fa8c8a Mon Sep 17 00:00:00 2001 From: choubung Date: Tue, 18 Nov 2025 11:31:52 +0900 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20cd=20build=20=EC=8A=A4=ED=85=9D?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=9E=90=EB=B0=94=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=A7=80=EC=A0=95=20=EB=9D=BC=EC=9D=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index edeb8e5..e80b88e 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -32,8 +32,6 @@ jobs: with: arguments: clean build cache-disabled: true - java-version: '21' - distribution: 'temurin' env: GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}