actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-15 14:26:48 +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

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 {