Skip to content

Commit 23a26ce

Browse files
committed
Fix java version of build-tools test
1 parent fcac3fb commit 23a26ce

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

gradle/runtime-jdk-provision.gradle

+15-12
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,23 @@ import org.elasticsearch.gradle.info.BuildParams
55
apply plugin: 'elasticsearch.jdk-download'
66

77
jdks {
8-
provisioned_runtime {
9-
vendor = VersionProperties.bundledJdkVendor
10-
version = VersionProperties.getBundledJdk(OS.current().name().toLowerCase())
11-
platform = OS.current().name().toLowerCase()
12-
}
8+
provisioned_runtime {
9+
vendor = VersionProperties.bundledJdkVendor
10+
version = VersionProperties.getBundledJdk(OS.current().name().toLowerCase())
11+
platform = OS.current().name().toLowerCase()
12+
}
1313
}
1414

1515
allprojects {
16+
if (project.path != ":build-tools") {
17+
// Build tools doesn't support java 8 still used in CI
1618
project.tasks.withType(Test).configureEach { Test test ->
17-
if (BuildParams.getIsRuntimeJavaHomeSet()) {
18-
test.executable = "${BuildParams.runtimeJavaHome}/bin/java"
19-
} else {
20-
test.dependsOn(rootProject.jdks.provisioned_runtime)
21-
test.executable = rootProject.jdks.provisioned_runtime.getBinJavaPath()
22-
}
19+
if (BuildParams.getIsRuntimeJavaHomeSet()) {
20+
test.executable = "${BuildParams.runtimeJavaHome}/bin/java"
21+
} else {
22+
test.dependsOn(rootProject.jdks.provisioned_runtime)
23+
test.executable = rootProject.jdks.provisioned_runtime.getBinJavaPath()
24+
}
2325
}
24-
}
26+
}
27+
}

0 commit comments

Comments
 (0)