Skip to content

Commit

Permalink
Centralize CI build JDK, update with Renovate (#1596)
Browse files Browse the repository at this point in the history
  • Loading branch information
JakeWharton authored Feb 28, 2025
1 parent ec16062 commit ab6a2d8
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 29 deletions.
7 changes: 0 additions & 7 deletions .github/renovate.json

This file was deleted.

26 changes: 26 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
extends: [
'config:recommended',
],
ignorePresets: [
// Ensure we get the latest version and are not pinned to old versions.
'workarounds:javaLTSVersions',
],
customManagers: [
// Update .java-version file with the latest JDK version.
{
customType: 'regex',
fileMatch: [
'\\.java-version$',
],
matchStrings: [
'(?<currentValue>.*)\\n',
],
datasourceTemplate: 'java-version',
depNameTemplate: 'java',
// Only write the major version.
extractVersionTemplate: '^(?<version>\\d+)',
},
]
}
1 change: 1 addition & 0 deletions .github/workflows/.java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
19
29 changes: 12 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- 8
- 11
- 17
- 19
- latest

steps:
- name: Checkout
Expand All @@ -32,11 +32,10 @@ jobs:
- name: Validate Gradle Wrapper
uses: gradle/actions/wrapper-validation@v4

- name: Configure JDK
uses: actions/setup-java@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 19
java-version-file: .github/workflows/.java-version

- name: Test
run: |
Expand All @@ -56,7 +55,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 19
java-version-file: .github/workflows/.java-version

- uses: gradle/actions/setup-gradle@v4

Expand All @@ -78,11 +77,10 @@ jobs:
- name: Validate Gradle Wrapper
uses: gradle/actions/wrapper-validation@v4

- name: Configure JDK
uses: actions/setup-java@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 19
java-version-file: .github/workflows/.java-version

- name: Test
run: |
Expand All @@ -103,11 +101,10 @@ jobs:
- name: Validate Gradle Wrapper
uses: gradle/actions/wrapper-validation@v4

- name: Configure JDK
uses: actions/setup-java@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 19
java-version-file: .github/workflows/.java-version

- name: Test
if: matrix.os != 'windows-latest'
Expand Down Expand Up @@ -135,11 +132,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Configure JDK
uses: actions/setup-java@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 19
java-version-file: .github/workflows/.java-version

- name: Upload Artifacts
run: |
Expand All @@ -161,11 +157,10 @@ jobs:
with:
fetch-depth: 0

- name: Configure JDK
uses: actions/setup-java@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 19
java-version-file: .github/workflows/.java-version

- name: Set up Python
uses: actions/setup-python@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 19
java-version-file: .github/workflows/.java-version

- run: ./gradlew publish
env:
Expand Down
10 changes: 6 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,14 @@ subprojects {
targetCompatibility = JavaVersion.VERSION_1_8.toString()
}

val testJavaVersion = System.getProperty("test.java.version", "19").toInt()
val testJavaVersion = System.getProperty("test.java.version", "").toIntOrNull()
tasks.withType<Test> {
val javaToolchains = project.extensions.getByType<JavaToolchainService>()
javaLauncher.set(javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(testJavaVersion))
})
if (testJavaVersion != null) {
javaLauncher.set(javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(testJavaVersion))
})
}

testLogging {
events(STARTED, PASSED, SKIPPED, FAILED)
Expand Down

0 comments on commit ab6a2d8

Please sign in to comment.