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

[Ubuntu] Add missing Java SDKs to Ubuntu 24.04 (#9808)

Browse Source
This commit is contained in:
Erik Bershel
2024-05-09 13:16:00 +02:00
committed by GitHub
parent 7781af869b
commit 24a830de3c
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
images/ubuntu/scripts/build/install-java-tools.sh
View File

@@ -70,21 +70,19 @@ echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium
apt-get update apt-get update
# While Ubuntu 24.04 binaries are not released in the Adoptium repo, we will not install Java # While Ubuntu 24.04 binaries are not released in the Adoptium repo, we will not install Java
if ! is_ubuntu24; then defaultVersion=$(get_toolset_value '.java.default')
defaultVersion=$(get_toolset_value '.java.default') jdkVersionsToInstall=($(get_toolset_value ".java.versions[]"))
jdkVersionsToInstall=($(get_toolset_value ".java.versions[]"))
for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do
install_open_jdk ${jdkVersionToInstall} install_open_jdk ${jdkVersionToInstall}
if [[ ${jdkVersionToInstall} == ${defaultVersion} ]] if [[ ${jdkVersionToInstall} == ${defaultVersion} ]]
then then
create_java_environment_variable ${jdkVersionToInstall} True create_java_environment_variable ${jdkVersionToInstall} True
else else
create_java_environment_variable ${jdkVersionToInstall} False create_java_environment_variable ${jdkVersionToInstall} False
fi fi
done done
fi
# Install Ant # Install Ant
apt-get install -y --no-install-recommends ant ant-optional apt-get install -y --no-install-recommends ant ant-optional

4
images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
View File

@@ -191,9 +191,7 @@ if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
} }
# Java # Java
if (-not $(Test-IsUbuntu24)) { $installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersionsTable))
$installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersionsTable))
}
# PHP Tools # PHP Tools
$phpTools = $installedSoftware.AddHeader("PHP Tools") $phpTools = $installedSoftware.AddHeader("PHP Tools")

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

@@ -1,6 +1,6 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameChecking
Describe "Java" -Skip:(Test-IsUbuntu24) { Describe "Java" {
$toolsetJava = (Get-ToolsetContent).java $toolsetJava = (Get-ToolsetContent).java
$defaultVersion = $toolsetJava.default $defaultVersion = $toolsetJava.default
$jdkVersions = $toolsetJava.versions $jdkVersions = $toolsetJava.versions

2
images/ubuntu/toolsets/toolset-2404.json
View File

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