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] Replace pkg-config with pkgconf in all macOS images (#11015)

Browse Source
This commit is contained in:
sarathrajsrinivasan
2024-11-22 06:23:29 -08:00
committed by GitHub
parent d22a5ec4c1
commit 26b592de2b
14 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +0,0 @@
#!/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/Generate-SoftwareReport.ps1
View File

@@ -137,7 +137,7 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) {
}
$utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion))
$utilities.AddToolVersion("Packer", $(Get-PackerVersion))
$utilities.AddToolVersion("pkg-config", $(Get-PKGConfigVersion))
$utilities.AddToolVersion("pkgconf", $(Get-PKGConfVersion))
if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) {
$utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion))
$utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion))

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

@@ -605,9 +605,9 @@ function Get-ColimaVersion {
return $colimaVersion
}
function Get-PKGConfigVersion {
$pkgconfigVersion = Run-Command "pkg-config --version"
return $pkgconfigVersion
function Get-PKGConfVersion {
$pkgconfVersion = Run-Command "pkgconf --version"
return $pkgconfVersion
}
function Get-XcbeautifyVersion {

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

@@ -178,3 +178,9 @@ Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia)
"magick -version" | Should -ReturnZeroExitCode
}
}
Describe "pkgconf" {
It "pkgconf" {
"pkgconf --version" | Should -ReturnZeroExitCode
}
}

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

@@ -168,9 +168,3 @@ 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,8 +218,7 @@ 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-pkg-config.sh"
"${path.root}/../scripts/build/install-unxip.sh"
]
}

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

@@ -220,8 +220,7 @@ 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-pkg-config.sh"
"${path.root}/../scripts/build/install-unxip.sh"
]
}

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

@@ -217,8 +217,7 @@ 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-pkg-config.sh"
"${path.root}/../scripts/build/install-common-utils.sh"
]
}

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

@@ -219,8 +219,7 @@ 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-pkg-config.sh"
"${path.root}/../scripts/build/install-common-utils.sh"
]
}

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

@@ -212,8 +212,7 @@ 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-pkg-config.sh"
"${path.root}/../scripts/build/install-common-utils.sh"
]
}

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

@@ -214,8 +214,7 @@ 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-pkg-config.sh"
"${path.root}/../scripts/build/install-common-utils.sh"
]
}

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

@@ -77,6 +77,7 @@
"p7zip",
"packer",
"perl",
"pkgconf",
"swiftformat",
"tcl-tk@8",
"zstd",

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

@@ -80,6 +80,7 @@
"p7zip",
"packer",
"perl",
"pkgconf",
"swiftformat",
"tcl-tk@8",
"zstd",

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

@@ -72,6 +72,7 @@
"p7zip",
"packer",
"perl",
"pkgconf",
"swiftformat",
"zstd",
"gmp",