actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-06 10:09:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Mac OS] Adapt code for Mac OS 14 image (#8760)

Browse Source
This commit is contained in:
Vasilii Polikarpov
2023-11-09 11:29:07 +01:00
committed by GitHub
parent 433178adf5
commit 01fe87da2e
20 changed files with 140 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,14 +9,14 @@ Describe "Android" {
[int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version"
[version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version"
[array]$ndkVersions = Get-ToolsetValue "android.ndk.versions"
$ndkFullVersions = $ndkVersions | ForEach-Object { Get-ChildItem "$env:ANDROID_HOME/ndk/${_}.*" -Name | Select-Object -Last 1} | ForEach-Object { "ndk/${_}" }
$ndkFullVersions = $ndkVersions | ForEach-Object { Get-ChildItem "$env:ANDROID_HOME/ndk/${_}.*" -Name | Select-Object -Last 1 } | ForEach-Object { "ndk/${_}" }
# Platforms starting with a letter are the preview versions, which is not installed on the image
$platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d" } | Sort-Object -Unique
$platformsInstalled = $platformVersionsList | Where-Object { [int]($_.Split("-")[0]) -ge $platformMinVersion } | ForEach-Object { "platforms/android-${_}" }
$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/${_}" }
$buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$" } | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique |
ForEach-Object { "build-tools/${_}" }
$androidPackages = @(
"tools",
@@ -31,14 +31,14 @@ Describe "Android" {
) | ForEach-Object { $_ }
# Remove empty strings from array to avoid possible issues
$androidPackages = $androidPackages | Where-Object {$_}
$androidPackages = $androidPackages | Where-Object { $_ }
BeforeAll {
$ANDROID_SDK_DIR = Join-Path $env:HOME "Library" "Android" "sdk"
function Validate-AndroidPackage {
param (
[Parameter(Mandatory=$true)]
[Parameter(Mandatory = $true)]
[string]$PackageName
)
@@ -51,22 +51,17 @@ Describe "Android" {
}
Context "SDKManagers" {
if (-not $os.IsVentura -and -not $os.IsVenturaArm64) {
$testCases = @(
$testCases = @(
@{
PackageName = "Command-line tools"
Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
}
)
if ($os.IsBigSur -or $os.IsMonterey) {
$testCases += @(
@{
PackageName = "SDK tools"
Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager"
},
@{
PackageName = "Command-line tools"
Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
}
)
}else {
$testCases = @(
@{
PackageName = "Command-line tools"
Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager"
}
)
}
@@ -84,4 +79,4 @@ Describe "Android" {
Validate-AndroidPackage $PackageName
}
}
}
}