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

Fix XCode simulators installation (#7769)

Browse Source
This commit is contained in:
Vasilii Polikarpov
2023-06-30 17:14:01 +02:00
committed by GitHub
parent 5ebe1af489
commit 9f98ea4461
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
images/macos/helpers/Xcode.Installer.psm1
View File

@@ -166,14 +166,14 @@ function Install-AdditionalSimulatorRuntimes {
[string]$Version [string]$Version
) )
if (-not $Version.StartsWith("14.")) { if ($Version.Split(".")[0] -lt 14) {
# Additional simulator runtimes are included by default for Xcode < 14 # Additional simulator runtimes are included by default for Xcode < 14
return return
} }
Write-Host "Installing Simulator Runtimes for Xcode $($_.link) ..." Write-Host "Installing Simulator Runtimes for Xcode $Version ..."
$xcodebuildPath = Get-XcodeToolPath -Version $Version -ToolName "xcodebuild" $xcodebuildPath = Get-XcodeToolPath -Version $Version -ToolName "xcodebuild"
Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms" Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms | xcpretty"
} }
function Build-XcodeSymlinks { function Build-XcodeSymlinks {

6
images/macos/provision/core/xcode.ps1
View File

@@ -36,11 +36,13 @@ $xcodeVersions | ForEach-Object -ThrottleLimit $threadCount -Parallel {
Write-Host "Configuring Xcode versions..." Write-Host "Configuring Xcode versions..."
$xcodeVersions | ForEach-Object { $xcodeVersions | ForEach-Object {
Write-Host "Configuring Xcode $($_.link) ..." Write-Host "Configuring Xcode $($_.link) ..."
Invoke-XcodeRunFirstLaunch -Version $_.link Invoke-XcodeRunFirstLaunch -Version $_.link
Install-AdditionalSimulatorRuntimes -Version $_.link
} }
$latestVersion = $xcodeVersions | Sort-Object -Property link -Descending | Select-Object -First 1 -ExpandProperty link
Write-Host "Installing simulators for version $latestVersion..."
Install-AdditionalSimulatorRuntimes -Version $latestVersion
Invoke-XcodeRunFirstLaunch -Version $defaultXcode Invoke-XcodeRunFirstLaunch -Version $defaultXcode
Write-Host "Configuring Xcode symlinks..." Write-Host "Configuring Xcode symlinks..."

4
images/macos/tests/Xcode.Tests.ps1
View File

@@ -98,12 +98,16 @@ Describe "Xcode simulators" {
It "No duplicates in devices" -TestCases $testCase { It "No duplicates in devices" -TestCases $testCase {
Switch-Xcode -Version $XcodeVersion Switch-Xcode -Version $XcodeVersion
[array]$devicesList = @(Get-XcodeDevicesList | Where-Object { $_ }) [array]$devicesList = @(Get-XcodeDevicesList | Where-Object { $_ })
Write-Host "Devices for $XcodeVersion"
Write-Host ($devicesList -join "`n")
Validate-ArrayWithoutDuplicates $devicesList -Because "Found duplicate device simulators" Validate-ArrayWithoutDuplicates $devicesList -Because "Found duplicate device simulators"
} }
It "No duplicates in pairs" -TestCases $testCase { It "No duplicates in pairs" -TestCases $testCase {
Switch-Xcode -Version $XcodeVersion Switch-Xcode -Version $XcodeVersion
[array]$pairsList = @(Get-XcodePairsList | Where-Object { $_ }) [array]$pairsList = @(Get-XcodePairsList | Where-Object { $_ })
Write-Host "Pairs for $XcodeVersion"
Write-Host ($pairsList -join "`n")
Validate-ArrayWithoutDuplicates $pairsList -Because "Found duplicate pairs simulators" Validate-ArrayWithoutDuplicates $pairsList -Because "Found duplicate pairs simulators"
} }
} }