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

[macOS] Pin version for tcl/tk and pkg-config (#10971)

Browse Source
This commit is contained in:
sarathrajsrinivasan
2024-11-15 03:45:48 -08:00
committed by GitHub
parent 9b55b80556
commit 5cd2ef1b0a
12 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
images/macos/scripts/build/install-pkg-config.sh Normal file
View File

@@ -0,0 +1,15 @@
#!/bin/bash -e -o pipefail
################################################################################
## File: install-pkg-config.sh
## Desc: Install pkg-config
################################################################################
source ~/utils/utils.sh
echo "Installing pkg-config..."
brew tap-new my-org/old-formulas
brew extract pkg-config my-org/old-formulas --version=0.29.2
brew install my-org/old-formulas/pkg-config@0.29.2
invoke_tests "Common" "pkg-config"

2
images/macos/scripts/docs-gen/SoftwareReport.Common.psm1
View File

@@ -538,7 +538,7 @@ function Get-LibXextVersion {
}
function Get-TclTkVersion {
$tcltkVersion = (Run-Command "brew info --json tcl-tk" | ConvertFrom-Json).installed.version
$tcltkVersion = (Run-Command "brew info --json tcl-tk@8" | ConvertFrom-Json).installed.version
return $tcltkVersion
}

6
images/macos/scripts/tests/Common.Tests.ps1
View File

@@ -168,3 +168,9 @@ Describe "Unxip" {
"unxip --version" | Should -ReturnZeroExitCode
}
}
Describe "pkg-config" {
It "pkg-config" {
"pkg-config --version" | Should -ReturnZeroExitCode
}
}

3
images/macos/templates/macOS-13.anka.pkr.hcl
View File

@@ -218,7 +218,8 @@ build {
"${path.root}/../scripts/build/install-git.sh",
"${path.root}/../scripts/build/install-node.sh",
"${path.root}/../scripts/build/install-common-utils.sh",
"${path.root}/../scripts/build/install-unxip.sh"
"${path.root}/../scripts/build/install-unxip.sh",
"${path.root}/../scripts/build/install-pkg-config.sh"
]
}

3
images/macos/templates/macOS-13.arm64.anka.pkr.hcl
View File

@@ -220,7 +220,8 @@ build {
"${path.root}/../scripts/build/install-git.sh",
"${path.root}/../scripts/build/install-node.sh",
"${path.root}/../scripts/build/install-common-utils.sh",
"${path.root}/../scripts/build/install-unxip.sh"
"${path.root}/../scripts/build/install-unxip.sh",
"${path.root}/../scripts/build/install-pkg-config.sh"
]
}

3
images/macos/templates/macOS-14.anka.pkr.hcl
View File

@@ -217,7 +217,8 @@ build {
"${path.root}/../scripts/build/install-rubygems.sh",
"${path.root}/../scripts/build/install-git.sh",
"${path.root}/../scripts/build/install-node.sh",
"${path.root}/../scripts/build/install-common-utils.sh"
"${path.root}/../scripts/build/install-common-utils.sh",
"${path.root}/../scripts/build/install-pkg-config.sh"
]
}

3
images/macos/templates/macOS-14.arm64.anka.pkr.hcl
View File

@@ -219,7 +219,8 @@ build {
"${path.root}/../scripts/build/install-rubygems.sh",
"${path.root}/../scripts/build/install-git.sh",
"${path.root}/../scripts/build/install-node.sh",
"${path.root}/../scripts/build/install-common-utils.sh"
"${path.root}/../scripts/build/install-common-utils.sh",
"${path.root}/../scripts/build/install-pkg-config.sh"
]
}

3
images/macos/templates/macOS-15.anka.pkr.hcl
View File

@@ -212,7 +212,8 @@ build {
"${path.root}/../scripts/build/install-rubygems.sh",
"${path.root}/../scripts/build/install-git.sh",
"${path.root}/../scripts/build/install-node.sh",
"${path.root}/../scripts/build/install-common-utils.sh"
"${path.root}/../scripts/build/install-common-utils.sh",
"${path.root}/../scripts/build/install-pkg-config.sh"
]
}

3
images/macos/templates/macOS-15.arm64.anka.pkr.hcl
View File

@@ -214,7 +214,8 @@ build {
"${path.root}/../scripts/build/install-rubygems.sh",
"${path.root}/../scripts/build/install-git.sh",
"${path.root}/../scripts/build/install-node.sh",
"${path.root}/../scripts/build/install-common-utils.sh"
"${path.root}/../scripts/build/install-common-utils.sh",
"${path.root}/../scripts/build/install-pkg-config.sh"
]
}

3
images/macos/toolsets/toolset-13.json
View File

@@ -72,9 +72,8 @@
"p7zip",
"packer",
"perl",
"pkg-config",
"swiftformat",
"tcl-tk",
"tcl-tk@8",
"zstd",
"gmp",
"yq",

3
images/macos/toolsets/toolset-14.json
View File

@@ -75,9 +75,8 @@
"p7zip",
"packer",
"perl",
"pkg-config",
"swiftformat",
"tcl-tk",
"tcl-tk@8",
"zstd",
"gmp",
"yq",

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

@@ -67,7 +67,6 @@
"p7zip",
"packer",
"perl",
"pkg-config",
"swiftformat",
"zstd",
"gmp",