actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-13 12:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Windows] Replace '+' to '-' in java path (#3028)

Browse Source 
* Replace + to - in Java path

* Fix comment

* fix vendor name in software report
This commit is contained in:
Mikhail Timofeev
2021-03-27 10:50:50 +03:00
committed by GitHub
parent dd506183e2
commit b56d115a16
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1
View File

@@ -9,12 +9,14 @@ function Get-JavaVersions {
return $javaVersions | Sort-Object $sortRules | ForEach-Object {
$javaPath = $_.Value
# Take semver from the java path
$version = (Split-Path $javaPath) -replace "\w:\\.*\\"
# The path contains '-' sign in the version number instead of '+' due to the following issue, need to substitute it back https://github.com/actions/virtual-environments/issues/3014
$versionInPath = (Split-Path $javaPath) -replace "\w:\\.*\\"
$version = $versionInPath -replace '-', '+'
$defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : ""
[PSCustomObject] @{
"Version" = $version + $defaultPostfix
"Vendor" = "AdoptOpenJDK"
"Vendor" = "Adopt OpenJDK"
"Environment Variable" = $_.Name
}
}