mirror of
https://github.com/actions/runner-images.git
synced 2025-12-20 06:35:47 +00:00
[macOS] Fix ndk output in readme for Big Sur (#2597)
* Fix condition * Remove ndk-bundle retrieval from packages list * remove unnecessary packageinfo param * simplify function * move $versions definition
This commit is contained in:
@@ -84,7 +84,7 @@ function Build-AndroidTable {
|
|||||||
},
|
},
|
||||||
@{
|
@{
|
||||||
"Package" = "NDK"
|
"Package" = "NDK"
|
||||||
"Version" = Get-AndroidNDKVersions -PackageInfo $packageInfo
|
"Version" = Get-AndroidNDKVersions
|
||||||
},
|
},
|
||||||
@{
|
@{
|
||||||
"Package" = "SDK Patch Applier v4"
|
"Package" = "SDK Patch Applier v4"
|
||||||
@@ -161,28 +161,16 @@ function Get-AndroidGoogleAPIsVersions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function Get-AndroidNDKVersions {
|
function Get-AndroidNDKVersions {
|
||||||
param (
|
|
||||||
[Parameter(Mandatory)][AllowEmptyString()]
|
|
||||||
[string[]] $packageInfo
|
|
||||||
)
|
|
||||||
|
|
||||||
$os = Get-OSVersion
|
$os = Get-OSVersion
|
||||||
$versions = @()
|
|
||||||
|
|
||||||
if ($os.IsLessThanBigSur) {
|
if ($os.IsLessThanBigSur) {
|
||||||
# Hardcode NDK 15 as a separate case since it is installed manually without sdk-manager (to none default location)
|
# Hardcode NDK 15 as a separate case since it is installed manually without sdk-manager (to none default location)
|
||||||
|
$versions = @()
|
||||||
$versions += "15.2.4203891"
|
$versions += "15.2.4203891"
|
||||||
|
}
|
||||||
|
|
||||||
$ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk"
|
$ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk"
|
||||||
Get-ChildItem -Path $ndkFolderPath | ForEach-Object {
|
$versions += Get-ChildItem -Path $ndkFolderPath -Name
|
||||||
$versions += $_.Name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$versions += $packageInfo | Where-Object { $_ -Match "ndk-bundle" } | ForEach-Object {
|
|
||||||
$packageInfoParts = Split-TableRowByColumns $_
|
|
||||||
return $packageInfoParts[1]
|
|
||||||
}
|
|
||||||
|
|
||||||
return ($versions -Join "<br>")
|
return ($versions -Join "<br>")
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user