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

use "license accept timeout" only on MacOS-13 (#8084)

Browse Source
This commit is contained in:
ilia-shipitsin
2023-08-15 15:23:02 +02:00
committed by GitHub
parent 9f81916bc7
commit 5487dbaad9
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,10 +126,17 @@ function Approve-XcodeLicense {
[string]$Version [string]$Version
) )
$os = Get-OSVersion
$XcodeRootPath = Get-XcodeRootPath -Version $Version $XcodeRootPath = Get-XcodeRootPath -Version $Version
Write-Host "Approving Xcode license for '$XcodeRootPath'..." Write-Host "Approving Xcode license for '$XcodeRootPath'..."
$xcodeBuildPath = Get-XcodeToolPath -XcodeRootPath $XcodeRootPath -ToolName "xcodebuild" $xcodeBuildPath = Get-XcodeToolPath -XcodeRootPath $XcodeRootPath -ToolName "xcodebuild"
Invoke-ValidateCommand -Command "sudo $xcodeBuildPath -license accept" -Timeout 15
if ($os.IsVentura -or $os.IsVenturaArm64) {
Invoke-ValidateCommand -Command "sudo $xcodeBuildPath -license accept" -Timeout 15
} else {
Invoke-ValidateCommand -Command "sudo $xcodeBuildPath -license accept"
}
} }
function Install-XcodeAdditionalPackages { function Install-XcodeAdditionalPackages {