From 15a60352c01b1f59a641ad3f9415e43d3342f380 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 12 Oct 2023 20:38:12 +0200 Subject: [PATCH] [macOS] Fix Gradle test (#8543) --- images/macos/provision/core/openjdk.sh | 1 - images/macos/tests/Java.Tests.ps1 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index cc9208e7..dbbc1c62 100755 --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -70,7 +70,6 @@ installOpenJDK() { } arch=$(get_arch) -echo $arch defaultVersion=$(get_toolset_value '.java.'$arch'.default') jdkVersionsToInstall=($(get_toolset_value ".java.${arch}.versions[]")) diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index ef73eb96..5948b5a2 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -75,7 +75,7 @@ Describe "Java" { (Get-Command "gradle").Path | Should -BeExactly "/usr/local/bin/gradle" } - It "Gradle is installed to /opt/homebrew/bin/gradle" -Skip:($os.IsVentura) { + It "Gradle is installed to /opt/homebrew/bin/gradle" -Skip:(-not $os.IsVenturaArm64) { (Get-Command "gradle").Path | Should -BeExactly "/opt/homebrew/bin/gradle" } }