Skip to content

Commit cacdf3a

Browse files
committed
ci/build: use jdk 21 temurin for builds and docker base image
1 parent 42c2498 commit cacdf3a

File tree

6 files changed

+16
-17
lines changed

6 files changed

+16
-17
lines changed

.github/workflows/build-master.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
steps:
1515
- name: Checkout latest code
1616
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # ratchet:actions/checkout@v5
17-
- name: Set up JDK 17
17+
- name: Set up JDK 21
1818
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # ratchet:actions/setup-java@v5
1919
with:
20-
java-version: 17
21-
distribution: 'zulu'
20+
java-version: 21
21+
distribution: 'temurin'
2222
cache: 'gradle'
2323
- name: Setup Gradle
2424
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # ratchet:gradle/actions/setup-gradle@v4

.github/workflows/dokka.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
- name: Checkout latest code
1818
uses: actions/checkout@v5
1919

20-
- name: Set up JDK 17
20+
- name: Set up JDK 21
2121
uses: actions/setup-java@v5
2222
with:
23-
java-version: 17
24-
distribution: 'zulu'
23+
java-version: 21
24+
distribution: 'temurin'
2525
cache: 'gradle'
2626

2727
- name: Get the tag name

.github/workflows/manual_testing.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
with:
1616
ref: add-arm64-architecture
1717

18-
- name: Set up JDK 17
18+
- name: Set up JDK 21
1919
uses: actions/setup-java@v5
2020
with:
21-
java-version: 17
22-
distribution: 'zulu'
21+
java-version: 21
22+
distribution: 'temurin'
2323
cache: 'gradle'
2424

2525
- name: Build JVM stuff

.github/workflows/publish-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
steps:
1414
- name: Checkout latest code
1515
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # ratchet:actions/checkout@v5
16-
- name: Set up JDK 17
16+
- name: Set up JDK 21
1717
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # ratchet:actions/setup-java@v5
1818
with:
19-
java-version: 17
20-
distribution: 'zulu'
19+
java-version: 21
20+
distribution: 'temurin'
2121
cache: 'gradle'
2222
- name: Login to GitHub Container Registry
2323
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # ratchet:docker/login-action@v3

.github/workflows/test-pr.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
- name: Checkout latest code
1313
uses: actions/checkout@v5
1414

15-
- name: Set up JDK 17
15+
- name: Set up JDK 21
1616
uses: actions/setup-java@v5
1717
with:
18-
java-version: 17
19-
distribution: 'zulu'
18+
java-version: 21
19+
distribution: 'temurin'
2020
cache: 'gradle'
2121

2222
- name: Build with Gradle

build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import java.time.Duration
21
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
32
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
43
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
@@ -207,7 +206,7 @@ jib {
207206
os = "linux"
208207
}
209208
}
210-
image = "gcr.io/distroless/java17-debian12"
209+
image = "gcr.io/distroless/java21-debian12"
211210
}
212211
container {
213212
ports = listOf("8080")

0 commit comments

Comments
 (0)