diff --git a/README.md b/README.md index 4d4edeb95..34995b955 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ We use third-party package managers to install software during the image generat | Ubuntu | [APT](https://wiki.debian.org/Apt) | [Eclipse-Timurin (Adoptium)](https://packages.adoptium.net/artifactory/deb)
[Erlang](https://packages.erlang-solutions.com/ubuntu)
[Firefox](https://launchpad.net/~mozillateam/+archive/ubuntu/ppa)
[gcc, gfortran](https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test)
[git](https://launchpad.net/~git-core/+archive/ubuntu/ppa)
[HHvm](https://dl.hhvm.com/ubuntu)
[PHP](https://launchpad.net/~ondrej/+archive/ubuntu/php) (Ubuntu 20 only)
[Mono](https://download.mono-project.com/repo/ubuntu)
[PostgreSQL](https://apt.postgresql.org/pub/repos/apt)
[R](https://cloud.r-project.org/bin/linux/ubuntu) | | | [pipx](https://pypa.github.io/pipx) | ansible-core
yamllint | | Windows | [Chocolatey](https://chocolatey.org) | No third-party repos installed | -| macOS | [Homebrew](https://homebrew.sh) | [aws-cli v2](https://github.com/aws/homebrew-tap)
[azure/bicep](https://github.com/Azure/homebrew-bicep)
[graalvm-ce-java11](https://github.com/graalvm/homebrew-tap)
[mongodb/brew](https://github.com/mongodb/homebrew-brew) | +| macOS | [Homebrew](https://homebrew.sh) | [aws-cli v2](https://github.com/aws/homebrew-tap)
[azure/bicep](https://github.com/Azure/homebrew-bicep)
[mongodb/brew](https://github.com/mongodb/homebrew-brew) | | | [pipx](https://pypa.github.io/pipx/) | yamllint | diff --git a/images/macos/provision/core/graalvm.sh b/images/macos/provision/core/graalvm.sh deleted file mode 100644 index 05eb24356..000000000 --- a/images/macos/provision/core/graalvm.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/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" - -# Install Native Image -$exportPath/gu install native-image - -invoke_tests "Common" "GraalVM" \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 0cc3d1d80..38b34d5f2 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -613,21 +613,6 @@ function Build-MiscellaneousEnvironmentTable { } } -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 - } -} - function Get-CodeQLBundleVersions { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $CodeQLVersionPaths = Get-ChildItem $CodeQLVersionsWildcard diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 46bcff91b..a69e53949 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -187,10 +187,6 @@ $java = $installedSoftware.AddHeader("Java") $java.AddTable($(Get-JavaVersions)) if (-not $os.IsVentura) { - # Graal - $graalvm = $installedSoftware.AddHeader("GraalVM") - $graalvm.AddTable($(Build-GraalVMTable)) - # Toolcache $toolcache = $installedSoftware.AddHeader("Cached Tools") $toolcache.AddNodes($(Build-ToolcacheSection)) diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl index 444df522f..aaabfd59c 100644 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ b/images/macos/templates/macOS-11.anka.pkr.hcl @@ -225,7 +225,6 @@ build { "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh", - "./provision/core/graalvm.sh", "./provision/core/codeql-bundle.sh" ] environment_vars = [ diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 510391438..81da48671 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -212,7 +212,6 @@ "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh", - "./provision/core/graalvm.sh", "./provision/core/codeql-bundle.sh" ], "environment_vars": [ diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 3fd4a8eac..80aef5caa 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -226,7 +226,6 @@ build { "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh", - "./provision/core/graalvm.sh", "./provision/core/codeql-bundle.sh" ] environment_vars = [ diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 52954340a..094944c55 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -213,7 +213,6 @@ "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh", - "./provision/core/graalvm.sh", "./provision/core/codeql-bundle.sh" ], "environment_vars": [ diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index f2c02c5db..d3a4dbb0d 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -123,16 +123,6 @@ Describe "Go" { } } -Describe "GraalVM" { - It "graalvm" { - '$GRAALVM_11_ROOT/java -version' | Should -ReturnZeroExitCode - } - - It "native-image" { - '$GRAALVM_11_ROOT/native-image --version' | Should -ReturnZeroExitCode - } -} - Describe "VirtualBox" -Skip:($os.IsBigSur) { It "Check kext kernel modules" { kextstat | Out-String | Should -Match "org.virtualbox.kext"