Skip to content

Commit 5e46e30

Browse files
Use always latest toolchain and only run tests in old JVMs
1 parent 06e3158 commit 5e46e30

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323

2424
- run: ./gradlew assemble check --info
2525
env:
26-
JAVA_TOOLCHAIN: ${{ matrix.java-version }}
26+
TEST_JAVA_TOOLCHAIN: ${{ matrix.java-version }}

build.gradle

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,17 @@ plugins {
66
id "com.diffplug.spotless" version "7.2.1"
77
}
88

9-
var javaToolchain = System.getenv('JAVA_TOOLCHAIN')
10-
11-
java {
12-
if (javaToolchain != null) {
13-
toolchain {
14-
languageVersion = JavaLanguageVersion.of(javaToolchain)
15-
}
16-
}
17-
}
9+
var testJavaToolchain = System.getenv('TEST_JAVA_TOOLCHAIN')
1810

1911
compileJava {
20-
if (javaToolchain != "8") {
12+
if (testJavaToolchain != "8") {
2113
options.release = 8
2214
}
2315
options.compilerArgs.add('-Xlint')
2416
}
2517

2618
compileTestJava {
27-
if (javaToolchain != "8") {
19+
if (testJavaToolchain != "8") {
2820
options.release = 8
2921
}
3022
options.compilerArgs.add('-Xlint')
@@ -48,6 +40,9 @@ testing {
4840
suites {
4941
test {
5042
useJUnitJupiter()
43+
if (testJavaToolchain != null) {
44+
languageVersion = JavaLanguageVersion.of(testJavaToolchain)
45+
}
5146
}
5247
}
5348
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package lbmq;
2+
3+
import org.junit.jupiter.api.Test;
4+
5+
public class VersionLoggerTest {
6+
7+
@Test
8+
public void versionLogger() {
9+
String version = System.getProperty("java.version");
10+
System.out.printf("Running in JVM version %s\n", version);
11+
}
12+
}

0 commit comments

Comments
 (0)