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

[Windows] Add Ninja (#11737)

Browse Source
This commit is contained in:
Alexey-Ayupov
2025-03-10 18:45:03 +01:00
committed by GitHub
parent 7809601472
commit 71845af4a0
6 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,6 +117,7 @@ $tools.AddToolVersion("WinAppDriver", $(Get-WinAppDriver))
$tools.AddToolVersion("WiX Toolset", $(Get-WixVersion))
$tools.AddToolVersion("yamllint", $(Get-YAMLLintVersion))
$tools.AddToolVersion("zstd", $(Get-ZstdVersion))
$tools.AddToolVersion("Ninja", $(Get-NinjaVersion))
# CLI Tools
$cliTools = $installedSoftware.AddHeader("CLI Tools")

4
images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1
View File

@@ -322,3 +322,7 @@ function Get-MongoshVersion {
function Get-WSL2Version {
return $((Get-AppxPackage -Name "MicrosoftCorporationII.WindowsSubsystemForLinux").version)
}
function Get-NinjaVersion {
return $(ninja --version)
}

28
images/windows/scripts/tests/ChocoPackages.Tests.ps1
View File

@@ -103,3 +103,31 @@ Describe "ImageMagick" {
"magick -version" | Should -ReturnZeroExitCode
}
}
Describe "Ninja" {
BeforeAll {
$ninjaProjectPath = $(Join-Path $env:TEMP_DIR "ninjaproject")
New-item -Path $ninjaProjectPath -ItemType Directory -Force
@'
cmake_minimum_required(VERSION 3.10)
project(NinjaTest NONE)
'@ | Out-File -FilePath "$ninjaProjectPath/CMakeLists.txt" -Encoding utf8
$ninjaProjectBuildPath = $(Join-Path $ninjaProjectPath "build")
New-item -Path $ninjaProjectBuildPath -ItemType Directory -Force
Set-Location $ninjaProjectBuildPath
}
It "Make a simple ninja project" {
"cmake -GNinja $ninjaProjectPath" | Should -ReturnZeroExitCode
}
It "build.ninja file should exist" {
$buildFilePath = $(Join-Path $ninjaProjectBuildPath "build.ninja")
$buildFilePath | Should -Exist
}
It "Ninja" {
"ninja --version" | Should -ReturnZeroExitCode
}
}

3
images/windows/toolsets/toolset-2019.json
View File

@@ -418,7 +418,8 @@
"name": "cmake.install",
"args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ]
},
{ "name": "imagemagick" }
{ "name": "imagemagick" },
{ "name": "ninja" }
]
},
"node": {

5
images/windows/toolsets/toolset-2022.json
View File

@@ -339,7 +339,8 @@
"name": "cmake.install",
"args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ]
},
{ "name": "imagemagick" }
{ "name": "imagemagick" },
{ "name": "ninja" }
]
},
"node": {
@@ -386,4 +387,4 @@
"pwsh": {
"version": "7.4"
}
}
}

5
images/windows/toolsets/toolset-2025.json
View File

@@ -298,7 +298,8 @@
"name": "strawberryperl" ,
"args": [ "--version", "5.40.0.1" ]
},
{ "name": "imagemagick" }
{ "name": "imagemagick" },
{ "name": "ninja" }
]
},
"node": {
@@ -340,4 +341,4 @@
"pwsh": {
"version": "7.4"
}
}
}