mirror of
https://github.com/actions/runner-images-sangeeth.git
synced 2025-12-20 06:29:50 +00:00
[macos] add android SDK to SW report on Ventura ARM64 (#8715)
This commit is contained in:
@@ -280,15 +280,15 @@ $installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo))
|
||||
|
||||
$installedSimulators = $xcode.AddHeader("Installed Simulators")
|
||||
$installedSimulators.AddTable($(Build-XcodeSimulatorsTable $xcodeInfo))
|
||||
if (-not $os.IsVenturaArm64) {
|
||||
# Android section
|
||||
$android = $installedSoftware.AddHeader("Android")
|
||||
$androidTable = Build-AndroidTable
|
||||
$android.AddTable($androidTable)
|
||||
|
||||
$androidEnv = $android.AddHeader("Environment variables")
|
||||
$androidEnv.AddTable($(Build-AndroidEnvironmentTable))
|
||||
}
|
||||
# Android section
|
||||
$android = $installedSoftware.AddHeader("Android")
|
||||
$androidTable = Build-AndroidTable
|
||||
$android.AddTable($androidTable)
|
||||
|
||||
$androidEnv = $android.AddHeader("Environment variables")
|
||||
$androidEnv.AddTable($(Build-AndroidEnvironmentTable))
|
||||
|
||||
if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) {
|
||||
$miscellaneous = $installedSoftware.AddHeader("Miscellaneous")
|
||||
$miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion))
|
||||
|
||||
@@ -201,6 +201,7 @@ build {
|
||||
"./provision/core/rust.sh",
|
||||
"./provision/core/gcc.sh",
|
||||
"./provision/core/cocoapods.sh",
|
||||
"./provision/core/android-toolsets.sh",
|
||||
"./provision/core/safari.sh",
|
||||
"./provision/core/chrome.sh",
|
||||
"./provision/core/bicep.sh",
|
||||
|
||||
@@ -4,7 +4,7 @@ Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -Di
|
||||
|
||||
$os = Get-OSVersion
|
||||
|
||||
Describe "Android" -Skip:($os.IsVenturaArm64) {
|
||||
Describe "Android" {
|
||||
$androidSdkManagerPackages = Get-AndroidPackages
|
||||
[int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version"
|
||||
[version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version"
|
||||
@@ -50,7 +50,7 @@ Describe "Android" -Skip:($os.IsVenturaArm64) {
|
||||
}
|
||||
}
|
||||
|
||||
Context "SDKManagers" -Skip:($os.IsVenturaArm64) {
|
||||
Context "SDKManagers" {
|
||||
if (-not $os.IsVentura -and -not $os.IsVenturaArm64) {
|
||||
$testCases = @(
|
||||
@{
|
||||
@@ -76,7 +76,7 @@ Describe "Android" -Skip:($os.IsVenturaArm64) {
|
||||
}
|
||||
}
|
||||
|
||||
Context "Packages" -Skip:($os.IsVenturaArm64) {
|
||||
Context "Packages" {
|
||||
$testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } }
|
||||
|
||||
It "<PackageName>" -TestCases $testCases {
|
||||
|
||||
Reference in New Issue
Block a user