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

[Ubuntu] Add Java 21 (#8560)

Browse Source
This commit is contained in:
Vasilii Polikarpov
2023-10-18 09:51:22 +02:00
committed by GitHub
parent f2d892281b
commit 0253f21ea5
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
images/linux/scripts/installers/java-tools.sh
View File

@@ -53,7 +53,12 @@ installOpenJDK() {
# https://github.com/adoptium/temurin-build/issues/2248 # https://github.com/adoptium/temurin-build/issues/2248
[[ ${fullJavaVersion} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/\.[0-9]+-/-/') [[ ${fullJavaVersion} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/\.[0-9]+-/-/')
# When version string is too short, add extra ".0" to make it valid semver
[[ ${fullJavaVersion} =~ ^[0-9]+- ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/-/.0-/')
[[ ${fullJavaVersion} =~ ^[0-9]+\.[0-9]+- ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/-/.0-/')
javaToolcacheVersionPath="${JAVA_TOOLCACHE_PATH}/${fullJavaVersion}" javaToolcacheVersionPath="${JAVA_TOOLCACHE_PATH}/${fullJavaVersion}"
echo "Java ${JAVA_VERSION} Toolcache Version Path: ${javaToolcacheVersionPath}"
mkdir -p "${javaToolcacheVersionPath}" mkdir -p "${javaToolcacheVersionPath}"
# Create a complete file # Create a complete file

2
images/linux/scripts/tests/Java.Tests.ps1
View File

@@ -45,6 +45,6 @@ Describe "Java" {
if ($Version -eq 8) { if ($Version -eq 8) {
$Version = "1.${Version}" $Version = "1.${Version}"
} }
"`"$javaPath`" -version" | Should -MatchCommandOutput ([regex]::Escape("openjdk version `"${Version}.")) "`"$javaPath`" -version" | Should -MatchCommandOutput "openjdk\ version\ `"${Version}(\.[0-9_\.]+)?`""
} }
} }

2
images/linux/toolsets/toolset-2004.json
View File

@@ -74,7 +74,7 @@
], ],
"java": { "java": {
"default": "11", "default": "11",
"versions": [ "8", "11", "17" ], "versions": [ "8", "11", "17", "21"],
"maven": "3.8.8" "maven": "3.8.8"
}, },
"android": { "android": {

2
images/linux/toolsets/toolset-2204.json
View File

@@ -68,7 +68,7 @@
], ],
"java": { "java": {
"default": "11", "default": "11",
"versions": [ "8", "11", "17" ], "versions": [ "8", "11", "17", "21"],
"maven": "3.8.8" "maven": "3.8.8"
}, },
"android": { "android": {