Add java tools installation to Ubuntu22 (#5612)

This commit is contained in:
Mikhail Timofeev
2022-05-26 00:11:06 +04:00
committed by GitHub
parent 9e72341e34
commit eabc37ce41
3 changed files with 6 additions and 7 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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",