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

[ubuntu] Refactor Toolset functions (#8948)

Browse Source
This commit is contained in:
Shamil Mubarakshin
2023-12-06 14:00:26 +01:00
committed by GitHub
parent a9bc069a35
commit 0ade9f36d3
4 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
images/ubuntu/scripts/tests/Android.Tests.ps1
View File

@@ -77,9 +77,9 @@ Describe "Android" {
}
$androidSdkManagerPackages = Get-AndroidPackages
[int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version"
[version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version"
[array]$ndkVersions = Get-ToolsetValue "android.ndk.versions"
[int]$platformMinVersion = (Get-ToolsetContent).android.platform_min_version
[version]$buildToolsMinVersion = (Get-ToolsetContent).android.build_tools_min_version
[array]$ndkVersions = (Get-ToolsetContent).android.ndk.versions
$ndkFullVersions = $ndkVersions |
ForEach-Object { (Get-ChildItem "/usr/local/lib/android/sdk/ndk/${_}.*" |
Select-Object -Last 1).Name } | ForEach-Object { "ndk/${_}" }
@@ -102,9 +102,9 @@ Describe "Android" {
$platformsInstalled,
$buildTools,
$ndkFullVersions,
(Get-ToolsetValue "android.extra_list" | ForEach-Object { "extras/${_}" }),
(Get-ToolsetValue "android.addon_list" | ForEach-Object { "add-ons/${_}" }),
(Get-ToolsetValue "android.additional_tools" | ForEach-Object { "${_}" })
((Get-ToolsetContent).android.extra_list | ForEach-Object { "extras/${_}" }),
((Get-ToolsetContent).android.addon_list | ForEach-Object { "add-ons/${_}" }),
((Get-ToolsetContent).android.additional_tools | ForEach-Object { "${_}" })
)
$androidPackages = $androidPackages | ForEach-Object { $_ }