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

Remove ndk-bundle + old ndk versions from macOS (#5929)

Browse Source
This commit is contained in:
Mikhail Timofeev
2022-07-21 11:33:26 +04:00
committed by GitHub
parent ef8f8086d5
commit 593ab19a0f
10 changed files with 6 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
images/macos/tests/Android.Tests.ps1
View File

@@ -9,9 +9,7 @@ Describe "Android" {
[int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version"
[version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version"
[array]$ndkVersions = Get-ToolsetValue "android.ndk.versions"
[string]$ndkDefaultVersion = Get-ToolsetValue "android.ndk.default"
$ndkFullVersions = $ndkVersions | ForEach-Object { Get-ChildItem "$env:ANDROID_HOME/ndk/${_}.*" -Name | Select-Object -Last 1} | ForEach-Object { "ndk/${_}" }
$ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1
# Platforms starting with a letter are the preview versions, which is not installed on the image
$platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d+$" } | Sort-Object -Unique
$platformsInstalled = $platformVersionsList | Where-Object { [int]$_ -ge $platformMinVersion } | ForEach-Object { "platforms/android-${_}" }
@@ -23,8 +21,6 @@ Describe "Android" {
$androidPackages = @(
"tools",
"platform-tools",
"tools/proguard",
"ndk-bundle",
"cmake",
$platformsInstalled,
$buildTools,
@@ -73,18 +69,11 @@ Describe "Android" {
Context "Packages" {
$testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } }
$defaultNdkTestCase = @{ NdkDefaultFullVersion = $ndkDefaultFullVersion }
It "<PackageName>" -TestCases $testCases {
param ([string] $PackageName)
Validate-AndroidPackage $PackageName
}
It "ndk-bundle points to the default NDK version" -TestCases $defaultNdkTestCase {
$ndkLinkTarget = (Get-Item $env:ANDROID_NDK_HOME).Target
$ndkVersion = Split-Path -Path $ndkLinkTarget -Leaf
$ndkVersion | Should -BeExactly $NdkDefaultFullVersion
}
}
It "HAXM is installed" -Skip:($os.IsHigherThanCatalina) {