diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 02e52d6..e80b88e 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -20,14 +20,18 @@ 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 with: arguments: clean build cache-disabled: true - java-version: '17' - distribution: 'temurin' env: GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61eac01..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: '17' - distribution: 'temurin' env: GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} \ No newline at end of file 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 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 {