mirror of
https://github.com/actions/runner-images-sangeeth.git
synced 2025-12-14 13:56:47 +00:00
Add java tools installation to Ubuntu22 (#5612)
This commit is contained in:
@@ -183,11 +183,9 @@ $markdown += New-MDList -Style Unordered -Lines (@(
|
||||
) | Sort-Object
|
||||
)
|
||||
|
||||
if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
|
||||
$markdown += New-MDHeader "Java" -Level 3
|
||||
$markdown += Get-JavaVersions | New-MDTable
|
||||
$markdown += New-MDNewLine
|
||||
}
|
||||
|
||||
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
|
||||
$markdown += New-MDHeader "GraalVM" -Level 3
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameChecking
|
||||
|
||||
Describe "Java" -Skip:(Test-IsUbuntu22) {
|
||||
Describe "Java" {
|
||||
$toolsetJava = (Get-ToolsetContent).java
|
||||
$defaultVersion = $toolsetJava.default
|
||||
$defaultVendor = $toolsetJava.default_vendor
|
||||
@@ -50,7 +50,7 @@ Describe "Java" -Skip:(Test-IsUbuntu22) {
|
||||
"`"$javaPath`" -version" | Should -MatchCommandOutput ([regex]::Escape("openjdk version `"${Version}."))
|
||||
}
|
||||
|
||||
It "Java Adopt <Version>" -TestCases $adoptJdkVersions {
|
||||
It "Java Adopt <Version>" -TestCases $adoptJdkVersions -Skip:(Test-IsUbuntu22) {
|
||||
$javaPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\bin\java"
|
||||
"`"$javaPath`" -version" | Should -ReturnZeroExitCode
|
||||
|
||||
|
||||
@@ -287,6 +287,7 @@ build {
|
||||
"${path.root}/scripts/installers/google-cloud-sdk.sh",
|
||||
"${path.root}/scripts/installers/haskell.sh",
|
||||
"${path.root}/scripts/installers/heroku.sh",
|
||||
"${path.root}/scripts/installers/java-tools.sh",
|
||||
"${path.root}/scripts/installers/kubernetes-tools.sh",
|
||||
"${path.root}/scripts/installers/oc.sh",
|
||||
"${path.root}/scripts/installers/miniconda.sh",
|
||||
|
||||
Reference in New Issue
Block a user