actions/runner-images-temp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix installer pattern to support macOS beta version (#6012)

Browse Source
This commit is contained in:
Aleksandr Chebotov
2022-08-03 13:12:07 +03:00
committed by GitHub
parent f4fb14342c
commit 2ec5b2e02e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
images.CI/macos/anka/Service.Helpers.psm1
+6 -2
View File
@@ -77,14 +77,14 @@ function Get-MacOSInstaller {
Write-Host "`t[*] The 'DownloadLatestVersion' flag is set. Latest macOS version is '$MacOSVersion' now" Write-Host "`t[*] The 'DownloadLatestVersion' flag is set. Latest macOS version is '$MacOSVersion' now"
} }
$macOSName = $availableVersions.Where{ $MacOSVersion -eq $_.OSVersion }.OSName $macOSName = $availableVersions.Where{ $MacOSVersion -eq $_.OSVersion }.OSName.Split(" ")[1]
if (-not $macOSName) { if (-not $macOSName) {
Write-Host "`t[x] Requested macOS '$MacOSVersion' version not found in the list of available installers. Available versions are:`n$($availableVersions.OSVersion)" Write-Host "`t[x] Requested macOS '$MacOSVersion' version not found in the list of available installers. Available versions are:`n$($availableVersions.OSVersion)"
Write-Host "`t[x] Make sure to pass '-BetaSearch `$true' if you need a beta version installer" Write-Host "`t[x] Make sure to pass '-BetaSearch `$true' if you need a beta version installer"
exit 1 exit 1
} }
$installerPathPattern = "/Applications/Install*${macOSName}.app" $installerPathPattern = "/Applications/Install macOS ${macOSName}*.app"
if (Test-Path $installerPathPattern) { if (Test-Path $installerPathPattern) {
$previousInstallerPath = Get-Item -Path $installerPathPattern $previousInstallerPath = Get-Item -Path $installerPathPattern
Write-Host "`t[*] Removing '$previousInstallerPath' installation app before downloading the new one" Write-Host "`t[*] Removing '$previousInstallerPath' installation app before downloading the new one"
@@ -104,6 +104,10 @@ function Get-MacOSInstaller {
} }
$installerPath = (Get-Item -Path $installerPathPattern).FullName $installerPath = (Get-Item -Path $installerPathPattern).FullName
if (-not $installerPath) {
Write-Host "`t[x] Path not found using '$installerPathPattern'"
exit 1
}
Write-Host "`t[*] Installer successfully downloaded to '$installerPath'" Write-Host "`t[*] Installer successfully downloaded to '$installerPath'"
$installerPath $installerPath