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

add replace from '+' to '-' (#3027)

Browse Source
This commit is contained in:
Dmitry Shibanov
2021-03-27 10:51:01 +03:00
committed by GitHub
parent b56d115a16
commit 60459a5b04
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/macos/provision/core/openjdk.sh
View File

@@ -21,7 +21,7 @@ installJavaFromAdoptOpenJDK() {
assetUrl=$(curl -s "https://api.adoptopenjdk.net/v3/assets/latest/${JAVA_VERSION}/hotspot") assetUrl=$(curl -s "https://api.adoptopenjdk.net/v3/assets/latest/${JAVA_VERSION}/hotspot")
asset=$(echo $assetUrl | jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")') asset=$(echo $assetUrl | jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")')
archivePath=$(echo $asset | jq -r '.binary.package.link') archivePath=$(echo $asset | jq -r '.binary.package.link')
fullVersion=$(echo $asset | jq -r '.version.semver') fullVersion=$(echo $asset | jq -r '.version.semver' | tr '+' '-')
javaToolcacheVersionPath=$JAVA_TOOLCACHE_PATH/$fullVersion javaToolcacheVersionPath=$JAVA_TOOLCACHE_PATH/$fullVersion
javaToolcacheVersionArchPath=$javaToolcacheVersionPath/x64 javaToolcacheVersionArchPath=$javaToolcacheVersionPath/x64

3
images/macos/software-report/SoftwareReport.Java.psm1
View File

@@ -10,10 +10,11 @@ function Get-JavaVersions {
$javaPath = $_.Value $javaPath = $_.Value
# Take semver from the java path # Take semver from the java path
$version = $javaPath.split('/')[5] $version = $javaPath.split('/')[5]
$fullVersion = $version.Replace('-', '+')
$defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : "" $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : ""
[PSCustomObject] @{ [PSCustomObject] @{
"Version" = $version + $defaultPostfix "Version" = $fullVersion + $defaultPostfix
"Vendor" = "Adopt OpenJDK" "Vendor" = "Adopt OpenJDK"
"Environment Variable" = $_.Name "Environment Variable" = $_.Name
} }