[MacOS] Add GraalVM to macOS 1015 and 11 images (#4959)

* Add GraalVM to macOS 1015 and 11 images

* Replace graalVM tests

* Resolve comments

* Fix native image install command path

* Fixing graalvm root path in tests

* Fix GRAALVM_11_ROOT path for software report

* Fix function name
This commit is contained in:
Maksim Shilov
2022-02-02 11:02:55 +03:00
committed by GitHub
parent aeebda1fcf
commit 8eabd4605b
7 changed files with 55 additions and 3 deletions

View File

@@ -0,0 +1,20 @@
#!/bin/bash -e -o pipefail
source ~/utils/utils.sh
echo Installing GraalVM...
brew install --cask graalvm/tap/graalvm-ce-java11
exportPath=$(echo /Library/Java/JavaVirtualMachines/graalvm-ce-java*/Contents/Home/bin)
echo "Setting up GRAALVM_11_ROOT variable to ${exportPath}"
echo "export GRAALVM_11_ROOT=${exportPath}" >> "${HOME}/.bashrc"
# GraalVM not being signed and notarized yet on macOS Catalina
if is_Catalina; then
quarantinePath=$(echo /Library/Java/JavaVirtualMachines/graalvm-ce-java*)
sudo xattr -rd com.apple.quarantine $quarantinePath
fi
# Install Native Image
$exportPath/gu install native-image
invoke_tests "Common" "GraalVM"

View File

@@ -549,3 +549,18 @@ function Build-PackageManagementEnvironmentTable {
}
}
}
function Get-GraalVMVersion {
$version = & "$env:GRAALVM_11_ROOT\java" --version | Select-String -Pattern "GraalVM" | Take-Part -Part 5,6
return $version
}
function Build-GraalVMTable {
$version = Get-GraalVMVersion
$envVariables = "GRAALVM_11_ROOT"
return [PSCustomObject] @{
"Version" = $version
"Environment variables" = $envVariables
}
}

View File

@@ -208,6 +208,10 @@ $markdown += New-MDHeader "Java" -Level 3
$markdown += Get-JavaVersions | New-MDTable
$markdown += New-MDNewLine
$markdown += New-MDHeader "GraalVM" -Level 3
$markdown += Build-GraalVMTable | New-MDTable
$markdown += New-MDNewLine
# Toolcache
$markdown += Build-ToolcacheSection
$markdown += New-MDNewLine

View File

@@ -194,7 +194,8 @@
"./provision/core/xcode-postbuild.sh",
"./provision/core/pypy.sh",
"./provision/core/pipx-packages.sh",
"./provision/core/bicep.sh"
"./provision/core/bicep.sh",
"./provision/core/graalvm.sh"
],
"environment_vars": [
"API_PAT={{user `github_api_pat`}}"

View File

@@ -197,7 +197,8 @@
"./provision/core/firefox.sh",
"./provision/core/pypy.sh",
"./provision/core/pipx-packages.sh",
"./provision/core/bicep.sh"
"./provision/core/bicep.sh",
"./provision/core/graalvm.sh"
],
"environment_vars": [
"API_PAT={{user `github_api_pat`}}"

View File

@@ -196,7 +196,8 @@
"./provision/core/firefox.sh",
"./provision/core/pypy.sh",
"./provision/core/pipx-packages.sh",
"./provision/core/bicep.sh"
"./provision/core/bicep.sh",
"./provision/core/graalvm.sh"
],
"environment_vars": [
"API_PAT={{user `github_api_pat`}}"

View File

@@ -103,4 +103,14 @@ Describe "Go" {
It "Go" {
"go version" | Should -ReturnZeroExitCode
}
}
Describe "GraalVM" {
It "graalvm" {
'$GRAALVM_11_ROOT/java -version' | Should -ReturnZeroExitCode
}
It "native-image" {
'$GRAALVM_11_ROOT/native-image --version' | Should -ReturnZeroExitCode
}
}