Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Java 17 for most of gradle-profiler tests #580

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Use Java 17 for most of gradle-profiler tests #580

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5de316f
Use Java 17 for most of gradle-profiler tests
asodja Oct 28, 2024
d3f984f
TeamCity config: Don't use new lines when setting -Porg.gradle.java.i…
asodja Oct 28, 2024
0abfa51
TeamCity: Reduce number of repetitions of setting Java version for ja…
asodja Oct 28, 2024
5273403
Upgrade tooling-api and fix tested Gradle versions for Java 17
asodja Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .teamcity/settings/GradleProfilerPublishToSdkMan.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ class GradleProfilerPublishToSdkMan(publishingBuild: GradleProfilerPublishing) :
}

params {
// Java home must always use Java11
// Java home must always use Java17
// since intellij-gradle-plugin is not compatible with Java8
javaHome(os, JavaVersion.OPENJDK_11)
javaHome(os, JavaVersion.OPENJDK_17)
text("additional.gradle.parameters", "")

param("env.ORG_GRADLE_PROJECT_sdkmanKey", "%gradleprofiler.sdkman.key%")
Expand Down
4 changes: 2 additions & 2 deletions .teamcity/settings/GradleProfilerPublishing.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ object GradleProfilerPublishing : BuildType({
val os = Os.linux

params {
// Java home must always use Java11
// Java home must always use Java17
// since intellij-gradle-plugin is not compatible with Java8
javaHome(os, JavaVersion.OPENJDK_11)
javaHome(os, JavaVersion.OPENJDK_17)
password("pgpSigningKey", "credentialsJSON:20c56c10-3c97-4753-91c2-685ddf26700e", display = ParameterDisplay.HIDDEN)
password("pgpSigningPassphrase", "credentialsJSON:d49291bd-101e-4165-a9a8-912ca457926b", display = ParameterDisplay.HIDDEN)
password("mavenCentralStagingRepoUser", "credentialsJSON:ce6ff00a-dc06-4b9b-aa1f-7b01bea2eb2f", display = ParameterDisplay.HIDDEN)
Expand Down
16 changes: 8 additions & 8 deletions .teamcity/settings/GradleProfilerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ open class GradleProfilerTest(os: Os, javaVersion: JavaVersion, arch: Arch = Arc
gradleProfilerVcs()

params {
// Java home must always use Java11
// Java home must always use Java17
// since intellij-gradle-plugin is not compatible with Java8
javaHome(os, JavaVersion.OPENJDK_11)
javaHome(os, JavaVersion.OPENJDK_17)
androidHome(os)
}

Expand Down Expand Up @@ -64,14 +64,14 @@ object LinuxJava8 : GradleProfilerTest(Os.linux, JavaVersion.ORACLE_JAVA_8, {
name = "Linux - Java 8"
})

object LinuxJava11 : GradleProfilerTest(Os.linux, JavaVersion.OPENJDK_11, {
name = "Linux - Java 11"
object LinuxJava17 : GradleProfilerTest(Os.linux, JavaVersion.OPENJDK_17, {
name = "Linux - Java 17"
})

object MacOSJava8 : GradleProfilerTest(Os.macos, JavaVersion.ORACLE_JAVA_8, {
name = "MacOS - Java 8"
object MacOSJava17 : GradleProfilerTest(Os.macos, JavaVersion.OPENJDK_17, {
name = "MacOS - Java 17"
})

object WindowsJava11 : GradleProfilerTest(Os.windows, JavaVersion.OPENJDK_11, {
name = "Windows - Java 11"
object WindowsJava17 : GradleProfilerTest(Os.windows, JavaVersion.OPENJDK_17, {
name = "Windows - Java 17"
})
4 changes: 2 additions & 2 deletions .teamcity/settings/extensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fun BuildType.agentRequirement(os: Os, arch: Arch = Arch.AMD64) {
fun toolchainConfiguration(os: Os) = listOf(
"-Porg.gradle.java.installations.auto-detect=false",
"-Porg.gradle.java.installations.auto-download=false",
""""-Porg.gradle.java.installations.paths=%${os.name}.java8.oracle.64bit%,%${os.name}.java11.openjdk.64bit%""""
""""-Porg.gradle.java.installations.paths=%${os.name}.java8.oracle.64bit%,%${os.name}.java11.openjdk.64bit%,%${os.name}.java17.openjdk.64bit%""""
).joinToString(" ")

fun ParametrizedWithType.javaHome(os: Os, javaVersion: JavaVersion) {
Expand All @@ -35,7 +35,7 @@ fun ParametrizedWithType.androidHome(os: Os) {

enum class JavaVersion(val majorVersion: String, val vendor: String, private val javaHomePostfix: String) {
ORACLE_JAVA_8("8", "oracle", "java8.oracle.64bit"),
OPENJDK_11("11", "openjdk", "java11.openjdk.64bit");
OPENJDK_17("17", "openjdk", "java17.openjdk.64bit");

fun javaHome(os: Os) = "%${os.name}.$javaHomePostfix%"
}
Expand Down
6 changes: 3 additions & 3 deletions .teamcity/settings/root-project.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ fun Project.configureGradleProfilerProject() {
description = "Runs tests and integration tests of the Gradle Profiler (https://github.com/gradle/gradle-profiler)"

val testBuilds = listOf(
MacOSJava8,
WindowsJava11,
MacOSJava17,
WindowsJava17,
LinuxJava8,
LinuxJava11
LinuxJava17
)

testBuilds.forEach(this::buildType)
Expand Down
Loading