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

[macOS] Add Ninja (#11707)

Browse Source
This commit is contained in:
Alexey-Ayupov
2025-03-04 15:56:00 +01:00
committed by GitHub
parent ff2db66e2d
commit 9e8d521bef
6 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,6 +97,7 @@ $utilities.AddToolVersion("pkgconf", $(Get-PKGConfVersion))
$utilities.AddToolVersion("Unxip", $(Get-UnxipVersion)) $utilities.AddToolVersion("Unxip", $(Get-UnxipVersion))
$utilities.AddToolVersion("yq", $(Get-YqVersion)) $utilities.AddToolVersion("yq", $(Get-YqVersion))
$utilities.AddToolVersion("zstd", $(Get-ZstdVersion)) $utilities.AddToolVersion("zstd", $(Get-ZstdVersion))
$utilities.AddToolVersion("Ninja", $(Get-NinjaVersion))
# Tools # Tools
$tools = $installedSoftware.AddHeader("Tools") $tools = $installedSoftware.AddHeader("Tools")

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

@@ -409,3 +409,7 @@ function Get-UnxipVersion {
$unxipVersion = Run-Command "unxip --version" | Take-Part -Part 1 $unxipVersion = Run-Command "unxip --version" | Take-Part -Part 1
return $unxipVersion return $unxipVersion
} }
function Get-NinjaVersion {
return $(ninja --version)
}

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

@@ -148,3 +148,25 @@ Describe "pkgconf" {
"pkgconf --version" | Should -ReturnZeroExitCode "pkgconf --version" | Should -ReturnZeroExitCode
} }
} }
Describe "Ninja" {
New-item -Path "/tmp/ninjaproject" -ItemType Directory -Force
Set-Location '/tmp/ninjaproject'
@'
cmake_minimum_required(VERSION 3.10)
project(NinjaTest NONE)
'@ | Out-File -FilePath "./CMakeLists.txt"
It "Make a simple ninja project" {
"cmake -GNinja /tmp/ninjaproject" | Should -ReturnZeroExitCode
}
It "build.ninja file should exist" {
$buildFilePath = Join-Path "/tmp/ninjaproject" "build.ninja"
$buildFilePath | Should -Exist
}
It "Ninja" {
"ninja --version" | Should -ReturnZeroExitCode
}
}

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

@@ -81,6 +81,7 @@
"swiftformat", "swiftformat",
"tcl-tk@8", "tcl-tk@8",
"zstd", "zstd",
"ninja",
"gmp", "gmp",
"yq", "yq",
"xcbeautify", "xcbeautify",

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

@@ -84,6 +84,7 @@
"swiftformat", "swiftformat",
"tcl-tk@8", "tcl-tk@8",
"zstd", "zstd",
"ninja",
"gmp", "gmp",
"yq", "yq",
"unxip", "unxip",

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

@@ -77,6 +77,7 @@
"pkgconf", "pkgconf",
"swiftformat", "swiftformat",
"zstd", "zstd",
"ninja",
"gmp", "gmp",
"yq", "yq",
"unxip", "unxip",