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

[macOS] Don't show CodeQl in Catalina's sw report (#6139)

Browse Source
This commit is contained in:
Mikhail Koliada
2022-08-24 17:17:18 +02:00
committed by GitHub
parent ef55b435e5
commit 06dd4c14e4
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
images/macos/software-report/SoftwareReport.Generator.ps1
View File

@@ -159,10 +159,15 @@ $toolsList = @(
(Get-AzureDevopsVersion), (Get-AzureDevopsVersion),
(Get-AWSCLIVersion), (Get-AWSCLIVersion),
(Get-AWSSAMCLIVersion), (Get-AWSSAMCLIVersion),
(Get-AWSSessionManagerCLIVersion), (Get-AWSSessionManagerCLIVersion)
(Get-CodeQLBundleVersion)
) )
if (-not $os.IsCatalina) {
$toolsList += @(
(Get-CodeQLBundleVersion)
)
}
if ($os.IsLessThanMonterey) { if ($os.IsLessThanMonterey) {
$toolsList += @( $toolsList += @(
(Get-AliyunCLIVersion) (Get-AliyunCLIVersion)

4
images/macos/tests/Common.Tests.ps1
View File

@@ -139,13 +139,13 @@ Describe "VirtualBox" -Skip:($os.IsBigSur) {
} }
} }
Describe "CodeQL" { Describe "CodeQL" -Skip:($os.IsCatalina) {
It "codeql" { It "codeql" {
$CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*"
$CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName $CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName
$CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql"
"$CodeQLPath version --quiet" | Should -ReturnZeroExitCode "$CodeQLPath version --quiet" | Should -ReturnZeroExitCode
$CodeQLPacksPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" $CodeQLPacksPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks"
$CodeQLPacksPath | Should -Exist $CodeQLPacksPath | Should -Exist
} }