actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2026-01-01 06:37:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Windows] Switch android tools installation to use cmdline-tools' sdkmanager (#3682)

Browse Source 
* Switch android installation to use cmdline-tools
* Rename update-android sdk to install-android sdk as for the other OSs
* Remove cmdline-tools installation from toolset as it's installed
* Regenerate licenses for the new sdkmanager
* Add tests to check that both sdkmanagers are available
* Simplify Get-AndroidInstalledPackages function to use list_installed

* Resolve nitpicks from @AlenaSviridenko
* Add extra lines to separate comments from the code
* Remove extra line after $androidNDKs

* Modify software report to output any version number

* Change regex pattern to output the group
* Currently the function returns 4. instead of 4.0, this change fixes it
This commit is contained in:
Mikhail Timofeev
2021-07-07 15:16:35 +03:00
committed by GitHub
parent cc3405ff7a
commit 6e7af98600
8 changed files with 204 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
images/win/scripts/Tests/Android.Tests.ps1
View File

@@ -51,33 +51,52 @@ Describe "Android SDK" {
$additionalToolsTestCases += @{ additionalToolVersion = $_; installedPackages = $androidInstalledPackages }
}
It "Platform version <platformVersion> is installed" -TestCases $platformTestCases {
"$installedPackages" | Should -Match "$platformVersion"
}
Context "SDKManagers" {
$testCases = @(
@{
PackageName = "SDK tools"
Sdkmanager = "$env:ANDROID_HOME\tools\bin\sdkmanager.bat"
},
@{
PackageName = "Command-line tools"
Sdkmanager = "$env:ANDROID_HOME\cmdline-tools\latest\bin\sdkmanager.bat"
}
)
It "Platform build tools <buildToolsVersion> is installed" -TestCases $buildToolsTestCases {
"$installedPackages" | Should -Match "$buildToolsVersion"
}
if (Test-IsWin19) {
It "Extra package <extraPackage> is installed" -TestCases $extraPackagesTestCases {
"$installedPackages" | Should -Match "extras;$extraPackage"
}
It "Addon package <addonPackage> is installed" -TestCases $addonsTestCases {
"$installedPackages" | Should -Match "add-ons;$addonPackage"
It "Sdkmanager from <PackageName> is available" -TestCases $testCases {
"$Sdkmanager --list" | Should -ReturnZeroExitCode
}
}
It "Additional tool <additionalToolVersion> is installed" -TestCases $additionalToolsTestCases {
"$installedPackages" | Should -Match $additionalToolVersion
}
Context "Packages" {
It "Platform version <platformVersion> is installed" -TestCases $platformTestCases {
"$installedPackages" | Should -Match "$platformVersion"
}
It "LTS NDK is installed" -TestCases @(@{ ndkLTSVersion = $ndkLTSMajorVersion; installedPackages = $androidInstalledPackages }) {
"$installedPackages" | Should -Match "ndk;$ndkLTSVersion"
}
It "Platform build tools <buildToolsVersion> is installed" -TestCases $buildToolsTestCases {
"$installedPackages" | Should -Match "$buildToolsVersion"
}
It "Latest NDK is installed" -TestCases @(@{ ndkLatestVersion = $ndkLatestMajorVersion; installedPackages = $androidInstalledPackages }) {
"$installedPackages" | Should -Match "ndk;$ndkLatestVersion"
if (Test-IsWin19) {
It "Extra package <extraPackage> is installed" -TestCases $extraPackagesTestCases {
"$installedPackages" | Should -Match "extras;$extraPackage"
}
It "Addon package <addonPackage> is installed" -TestCases $addonsTestCases {
"$installedPackages" | Should -Match "add-ons;$addonPackage"
}
}
It "Additional tool <additionalToolVersion> is installed" -TestCases $additionalToolsTestCases {
"$installedPackages" | Should -Match $additionalToolVersion
}
It "LTS NDK is installed" -TestCases @(@{ ndkLTSVersion = $ndkLTSMajorVersion; installedPackages = $androidInstalledPackages }) {
"$installedPackages" | Should -Match "ndk;$ndkLTSVersion"
}
It "Latest NDK is installed" -TestCases @(@{ ndkLatestVersion = $ndkLatestMajorVersion; installedPackages = $androidInstalledPackages }) {
"$installedPackages" | Should -Match "ndk;$ndkLatestVersion"
}
}
}