actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-12 20:26:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[macOS] Add TCL/TK to macOS 15 images (#13092)

Browse Source
This commit is contained in:
Erik Bershel
2025-09-26 15:29:04 +02:00
committed by GitHub
parent 9da76c777a
commit b41b1a3ee9
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/macos/scripts/build/install-common-utils.sh
View File

@@ -17,7 +17,7 @@ for package in $common_packages; do
tcl-tk@8) tcl-tk@8)
brew_smart_install "$package" brew_smart_install "$package"
if is_VenturaX64 || is_SonomaX64; then if is_VenturaX64 || is_SonomaX64 || is_SequoiaX64; then
# Fix for https://github.com/actions/runner-images/issues/11074 # 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/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 ln -sf "$(brew --prefix tcl-tk@8)/lib/libtk8.6.dylib" /usr/local/lib/libtk8.6.dylib

5
images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1
View File

@@ -174,11 +174,8 @@ $android.AddTable($androidTable)
$androidEnv = $android.AddHeader("Environment variables") $androidEnv = $android.AddHeader("Environment variables")
$androidEnv.AddTable($(Build-AndroidEnvironmentTable)) $androidEnv.AddTable($(Build-AndroidEnvironmentTable))
if ($os.IsSonoma -or $os.IsVentura -or (-not $os.IsArm64)) { if ($os.IsSonoma -or $os.IsVentura -or $os.IsSequoia) {
$miscellaneous = $installedSoftware.AddHeader("Miscellaneous") $miscellaneous = $installedSoftware.AddHeader("Miscellaneous")
}
if ($os.IsSonoma -or $os.IsVentura) {
$miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion)) $miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion))
} }

1
images/macos/toolsets/toolset-15.json
View File

@@ -181,6 +181,7 @@
"perl", "perl",
"pkgconf", "pkgconf",
"swiftformat", "swiftformat",
"tcl-tk@8",
"zstd", "zstd",
"ninja", "ninja",
"gmp", "gmp",