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

[macos] add android SDK to SW report on Ventura ARM64 (#8715)

Browse Source
This commit is contained in:
ilia-shipitsin
2023-11-07 09:20:25 +01:00
committed by GitHub
parent 9d94573ccd
commit be3fa4f3c3
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
images/macos/software-report/SoftwareReport.Generator.ps1
View File

@@ -280,15 +280,15 @@ $installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo))
$installedSimulators = $xcode.AddHeader("Installed Simulators") $installedSimulators = $xcode.AddHeader("Installed Simulators")
$installedSimulators.AddTable($(Build-XcodeSimulatorsTable $xcodeInfo)) $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") # Android section
$androidEnv.AddTable($(Build-AndroidEnvironmentTable)) $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)) { if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) {
$miscellaneous = $installedSoftware.AddHeader("Miscellaneous") $miscellaneous = $installedSoftware.AddHeader("Miscellaneous")
$miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) $miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion))

1
images/macos/templates/macOS-13.arm64.anka.pkr.hcl
View File

@@ -201,6 +201,7 @@ build {
"./provision/core/rust.sh", "./provision/core/rust.sh",
"./provision/core/gcc.sh", "./provision/core/gcc.sh",
"./provision/core/cocoapods.sh", "./provision/core/cocoapods.sh",
"./provision/core/android-toolsets.sh",
"./provision/core/safari.sh", "./provision/core/safari.sh",
"./provision/core/chrome.sh", "./provision/core/chrome.sh",
"./provision/core/bicep.sh", "./provision/core/bicep.sh",

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

@@ -4,7 +4,7 @@ Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -Di
$os = Get-OSVersion $os = Get-OSVersion
Describe "Android" -Skip:($os.IsVenturaArm64) { Describe "Android" {
$androidSdkManagerPackages = Get-AndroidPackages $androidSdkManagerPackages = Get-AndroidPackages
[int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version"
[version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_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) { if (-not $os.IsVentura -and -not $os.IsVenturaArm64) {
$testCases = @( $testCases = @(
@{ @{
@@ -76,7 +76,7 @@ Describe "Android" -Skip:($os.IsVenturaArm64) {
} }
} }
Context "Packages" -Skip:($os.IsVenturaArm64) { Context "Packages" {
$testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } }
It "<PackageName>" -TestCases $testCases { It "<PackageName>" -TestCases $testCases {