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

Skip preview android sdk platforms installation (#5089)

Browse Source
This commit is contained in:
Mikhail Timofeev
2022-02-16 22:23:56 +03:00
committed by GitHub
parent 000b805803
commit cc2a6e1158
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
images/win/scripts/Installers/Install-AndroidSDK.ps1
View File

@@ -58,14 +58,11 @@ $androidPackages = Get-AndroidPackages -AndroidSDKManagerPath $sdkManager
# platforms # platforms
[int]$platformMinVersion = $androidToolset.platform_min_version [int]$platformMinVersion = $androidToolset.platform_min_version
$platformListByVersion = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` $platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
-PrefixPackageName "platforms;" ` -PrefixPackageName "platforms;" `
-MinimumVersion $platformMinVersion ` -MinimumVersion $platformMinVersion `
-Delimiter "-" ` -Delimiter "-" `
-Index 1 -Index 1
$platformListByName = Get-AndroidPackagesByName -AndroidPackages $androidPackages `
-PrefixPackageName "platforms;" | Where-Object {$_ -match "-\D+$"}
$platformList = $platformListByVersion + $platformListByName
# build-tools # build-tools
[version]$buildToolsMinVersion = $androidToolset.build_tools_min_version [version]$buildToolsMinVersion = $androidToolset.build_tools_min_version

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

@@ -14,14 +14,12 @@ Describe "Android SDK" {
$platformTestCases = @() $platformTestCases = @()
[int]$platformMinVersion = $androidToolset.platform_min_version [int]$platformMinVersion = $androidToolset.platform_min_version
$platformListByVersion = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` $platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
-PrefixPackageName "platforms;" ` -PrefixPackageName "platforms;" `
-MinimumVersion $platformMinVersion ` -MinimumVersion $platformMinVersion `
-Delimiter "-" ` -Delimiter "-" `
-Index 1 -Index 1
$platformListByName = Get-AndroidPackagesByName -AndroidPackages $androidPackages `
-PrefixPackageName "platforms;" | Where-Object {$_ -match "-\D+$"}
$platformList = $platformListByVersion + $platformListByName
$platformList | ForEach-Object { $platformList | ForEach-Object {
$platformTestCases += @{ platformVersion = $_; installedPackages = $androidInstalledPackages } $platformTestCases += @{ platformVersion = $_; installedPackages = $androidInstalledPackages }
} }