diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh index 96a46826b..9f9013538 100644 --- a/images/macos/scripts/build/install-common-utils.sh +++ b/images/macos/scripts/build/install-common-utils.sh @@ -21,7 +21,14 @@ for package in $common_packages; do # Packer has been deprecated in Homebrew. Use tap to install Packer. brew install hashicorp/tap/packer else - brew_smart_install "$package" + if (is_VenturaX64 || is_SonomaX64) && [[ $package == "tcl-tk@8" ]]; then + brew_smart_install "$package" + # Fix for https://github.com/actions/runner-images/issues/11074 + ln -sf $(brew --prefix tcl-tk@8)/lib/libtcl8.6.dylib /usr/local/lib/libtcl8.6.dylib + ln -sf $(brew --prefix tcl-tk@8)/lib/libtk8.6.dylib /usr/local/lib/libtk8.6.dylib + else + brew_smart_install "$package" + fi fi fi done diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index 2db65a1a9..53942da4d 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -62,10 +62,10 @@ Describe "Perl" { } } -Describe "Tcl/Tk" { +Describe "Tcl/Tk" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoia) { It "libtcl" { - "file /usr/local/lib/libtcl8.6.dylib" | Should -ReturnZeroExitCode - "file /usr/local/lib/libtk8.6.dylib" | Should -ReturnZeroExitCode + Test-Path "/usr/local/lib/libtcl8.6.dylib" | Should -BeTrue + Test-Path "/usr/local/lib/libtk8.6.dylib" | Should -BeTrue } }