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

[windows] Fix tests, remove cmake 3.6 (#2758)

Browse Source
This commit is contained in:
Aleksandr Chebotov
2021-02-19 21:27:58 +03:00
committed by GitHub
parent 2a0829d7e5
commit ee314d4c78
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,11 +39,14 @@ $androidPackages = Get-AndroidPackages -AndroidSDKManagerPath $sdkManager
# platforms # platforms
[int]$platformMinVersion = $androidToolset.platform_min_version [int]$platformMinVersion = $androidToolset.platform_min_version
$platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` $platformListByVersion = 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

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

@@ -10,11 +10,14 @@ Describe "Android SDK" {
$platformTestCases = @() $platformTestCases = @()
[int]$platformMinVersion = $androidToolset.platform_min_version [int]$platformMinVersion = $androidToolset.platform_min_version
$platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` $platformListByVersion = 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 }
} }

1
images/win/toolsets/toolset-2016.json
View File

@@ -163,7 +163,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",
"cmdline-tools;latest" "cmdline-tools;latest"

1
images/win/toolsets/toolset-2019.json
View File

@@ -163,7 +163,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",
"cmdline-tools;latest" "cmdline-tools;latest"