Skip to content

Commit

Permalink
[macOS] Add Symlink for tcl-tk8 (#11128)
Browse files Browse the repository at this point in the history
* [macOS] Add Symlink for tcl-tk8

* [macOS] Add condition for tcl tk only for macOS13 and macOS14 Intel machines

* [macOS] Update test case for tcl/tk

* [macOS] Update test cases for tcl/tk for macOS15

* [macOS] Update tcl/tk test cases
  • Loading branch information
sarathrajsrinivasan authored Dec 16, 2024
1 parent 0e631a8 commit 5c8a14c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
9 changes: 8 additions & 1 deletion images/macos/scripts/build/install-common-utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions images/macos/scripts/tests/BasicTools.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down

0 comments on commit 5c8a14c

Please sign in to comment.