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

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

Browse Source 
* fix tests

* get rid of build-tools letter list

* Remove Cmake 3.6, fix platforms test
This commit is contained in:
Mikhail Timofeev
2021-02-19 14:18:13 +03:00
committed by GitHub
parent 2c96d280ed
commit 18effcdd26
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
images/linux/scripts/tests/Android.Tests.ps1
View File

@@ -5,13 +5,14 @@ Describe "Android" {
[string]$ndkLTSVersion = Get-ToolsetValue "android.ndk.lts" [string]$ndkLTSVersion = Get-ToolsetValue "android.ndk.lts"
$ndkLTSFullVersion = (Get-ChildItem "/usr/local/lib/android/sdk/ndk/$ndkLTSVersion.*" | Select-Object -Last 1).Name $ndkLTSFullVersion = (Get-ChildItem "/usr/local/lib/android/sdk/ndk/$ndkLTSVersion.*" | Select-Object -Last 1).Name
$platforms = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;', '' | $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', ''
Where-Object { [int]$_.Split("-")[1] -ge $platformMinVersion } | Sort-Object { [int]$_.Split("-")[1] } -Unique | $platformNumericList = $platformVersionsList | Where-Object { $_ -match "\d+" } | Where-Object { [int]$_ -ge $platformMinVersion } | Sort-Object -Unique
ForEach-Object { "platforms/${_}" }) $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;', '' | $buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', ''
Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object { [version]$_ } -Unique | $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$"} | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique |
ForEach-Object { "build-tools/${_}" }) ForEach-Object { "build-tools/${_}" }
$androidPackages = @( $androidPackages = @(
$platforms, $platforms,
@@ -23,7 +24,7 @@ Describe "Android" {
) )
[string]$ndkLatestVersion = Get-ToolsetValue "android.ndk.latest" [string]$ndkLatestVersion = Get-ToolsetValue "android.ndk.latest"
if ($ndkLatestVersion) { if ($ndkLatestVersion) {
$ndkLatestFullVersion = (Get-ChildItem "/usr/local/lib/android/sdk/ndk/$ndkLatestVersion.*" | Select-Object -Last 1).Name $ndkLatestFullVersion = (Get-ChildItem "/usr/local/lib/android/sdk/ndk/$ndkLatestVersion.*" | Select-Object -Last 1).Name
$androidPackages += @("ndk/$ndkLatestFullVersion") $androidPackages += @("ndk/$ndkLatestFullVersion")
} }

1
images/linux/toolsets/toolset-1604.json
View File

@@ -103,7 +103,6 @@
"addon-google_apis-google-21" "addon-google_apis-google-21"
], ],
"additional_tools": [ "additional_tools": [
"cmake;3.6.4111459",
"cmake;3.10.2.4988404", "cmake;3.10.2.4988404",
"patcher;v4", "patcher;v4",
"platform-tools", "platform-tools",

1
images/linux/toolsets/toolset-1804.json
View File

@@ -99,7 +99,6 @@
"addon-google_apis-google-21" "addon-google_apis-google-21"
], ],
"additional_tools": [ "additional_tools": [
"cmake;3.6.4111459",
"cmake;3.10.2.4988404", "cmake;3.10.2.4988404",
"patcher;v4", "patcher;v4",
"platform-tools", "platform-tools",