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

accept proposal

Browse Source
This commit is contained in:
Maxim Lobanov
2020-11-11 14:33:35 +03:00
parent c656a9ddf2
commit 1aad4c7b8d
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
images/macos/helpers/Xcode.Helpers.psm1
View File

@@ -42,7 +42,6 @@ function Get-XcodeVersionInfo {
} }
} }
function Switch-Xcode { function Switch-Xcode {
param ( param (
[Parameter(ParameterSetName = 'Version')] [Parameter(ParameterSetName = 'Version')]

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

@@ -53,11 +53,9 @@ function Resolve-ExactXcodeVersion {
function Get-AvailableXcodeVersions { function Get-AvailableXcodeVersions {
$rawVersionsList = & xcversion list | ForEach-Object { $_.Trim() } | Where-Object { $_ -match "^\d" } $rawVersionsList = & xcversion list | ForEach-Object { $_.Trim() } | Where-Object { $_ -match "^\d" }
$availableVersions = $rawVersionsList | ForEach-Object { $availableVersions = $rawVersionsList | ForEach-Object {
$parts = $_.Split(" ", 2) $partStable,$partMajor = $_.Split(" ", 2)
$stableSemver = [SemVer]::Parse($parts[0]) $semver = $stableSemver = [SemVer]::Parse($partStable)
if ($parts.Count -eq 1) { if ($partMajor) {
$semver = $stableSemver
} else {
# Convert 'beta 3' -> 'beta.3', 'Release Candidate' -> 'releasecandidate', 'GM Seed 2' -> 'gmseed.2' # Convert 'beta 3' -> 'beta.3', 'Release Candidate' -> 'releasecandidate', 'GM Seed 2' -> 'gmseed.2'
$normalizedLabel = $parts[1].toLower() -replace " (\d)", '.$1' -replace " ([a-z])", '$1' $normalizedLabel = $parts[1].toLower() -replace " (\d)", '.$1' -replace " ([a-z])", '$1'
$semver = [SemVer]::new($stableSemver.Major, $stableSemver.Minor, $stableSemver.Patch, $normalizedLabel) $semver = [SemVer]::new($stableSemver.Major, $stableSemver.Minor, $stableSemver.Patch, $normalizedLabel)