actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-02 07:36:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

[macOS] Fix Android tests to work with platform version S and remove Cmake 3.6 (#2757)

Browse Source 
* Fix tests, move cmake to toolset

* add -L to curl
This commit is contained in:
Mikhail Timofeev
2021-02-19 14:52:13 +03:00
committed by GitHub
parent 18effcdd26
commit d76f3274f8
7 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,13 +13,14 @@ Describe "Android" {
$ndkLatestFullVersion = (Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkLatestVersion.*" | Select-Object -Last 1).Name
$ndkLtsFullVersion = (Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkLtsVersion.*" | Select-Object -Last 1).Name
$platforms = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;', '' |
Where-Object { [int]$_.Split("-")[1] -ge $platformMinVersion } | Sort-Object { [int]$_.Split("-")[1] } -Unique |
ForEach-Object { "platforms/${_}" })
$platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', ''
$platformNumericList = $platformVersionsList | Where-Object { $_ -match "\d+" } | Where-Object { [int]$_ -ge $platformMinVersion } | Sort-Object -Unique
$platformLetterList = $platformVersionsList | Where-Object { $_ -match "\D+" } | Sort-Object -Unique
$platforms = $platformNumericList + $platformLetterList | ForEach-Object { "platforms/android-${_}" }
$buildTools = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' |
Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object { [version]$_ } -Unique |
ForEach-Object { "build-tools/${_}" })
$buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', ''
$buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$"} | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique |
ForEach-Object { "build-tools/${_}" }
$androidPackages = @(
"tools",