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

[Windows] Refactor script installing Android SDK and packages (#8877)

Browse Source
This commit is contained in:
Vasilii Polikarpov
2023-11-27 12:28:21 +01:00
committed by GitHub
parent 9492109c62
commit 12066050d0
7 changed files with 276 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
images/windows/scripts/docs-gen/SoftwareReport.Android.psm1
View File

@@ -15,17 +15,6 @@ function Get-AndroidSDKRoot {
return "Location $path"
}
function Get-AndroidSDKManagerPath {
return Join-Path $env:ANDROID_HOME "cmdline-tools\latest\bin\sdkmanager.bat"
}
function Get-AndroidInstalledPackages {
$androidSDKManagerPath = Get-AndroidSDKManagerPath
$androidSDKManagerList = cmd /c "$androidSDKManagerPath --list_installed 2>&1"
$androidSDKManagerList = $androidSDKManagerList -notmatch "Warning"
return $androidSDKManagerList
}
function Build-AndroidTable {
$packageInfo = Get-AndroidInstalledPackages
return @(
@@ -84,7 +73,7 @@ function Build-AndroidTable {
) | Where-Object { $_.Version } | ForEach-Object {
[PSCustomObject] @{
"Package Name" = $_.Package
"Version" = $_.Version
"Version" = $_.Version
}
}
}
@@ -121,7 +110,7 @@ function Get-AndroidPlatformVersions {
}
function Get-AndroidCommandLineToolsVersion {
$commandLineTools = Get-AndroidSDKManagerPath
$commandLineTools = (Join-Path $env:ANDROID_HOME "cmdline-tools\latest\bin\sdkmanager.bat")
(cmd /c "$commandLineTools --version 2>NUL" | Out-String).Trim() -match "(?<version>^(\d+\.){1,}\d+$)" | Out-Null
$commandLineToolsVersion = $Matches.Version
return $commandLineToolsVersion