Skip to content

Use platform agnostic env variable with the JDK #310

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

Merged
merged 3 commits into from
Jun 3, 2025
Merged

Use platform agnostic env variable with the JDK #310

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4882fe2
Use platform agnostic env variable with the JDK
fzhinkin May 30, 2025
fbb396f
fixup! Use platform agnostic env variable with the JDK
fzhinkin Jun 3, 2025
9a15a4a
fixup! Use platform agnostic env variable with the JDK
fzhinkin Jun 3, 2025
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
9 changes: 2 additions & 7 deletions .teamcity/utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,12 @@ const val releaseVersionParameter = "releaseVersion"
const val libraryStagingRepoDescription = "kotlinx-benchmark"

val platforms = Platform.values()
const val jdk = "JDK_18_x64"
const val jdk = "JDK_17_0"

enum class Platform {
Windows, Linux, MacOS;
}

fun Platform.nativeTaskPrefix(): String = when(this) {
Platform.Windows -> "mingwX64"
Platform.Linux -> "linuxX64"
Platform.MacOS -> "macosX64"
}
fun Platform.buildTypeName(): String = when (this) {
Platform.Windows, Platform.Linux -> name
Platform.MacOS -> "Mac OS X"
Expand Down Expand Up @@ -117,4 +112,4 @@ fun BuildType.dependsOnSnapshot(build: IdOwner, onFailure: FailureAction = Failu
onDependencyCancel = FailureAction.CANCEL
}
}
}
}