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

reuse function

Browse Source
This commit is contained in:
Maxim Lobanov
2020-10-06 11:11:36 +03:00
parent 5a999ef791
commit f80d9cdc66
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,10 +47,16 @@ function Switch-Xcode {
function Test-XcodeStableRelease { function Test-XcodeStableRelease {
param ( param (
[Parameter(Mandatory)] [Parameter(ParameterSetName = 'Version')]
[string] $Version,
[Parameter(ParameterSetName = 'Path')]
[string] $XcodeRootPath [string] $XcodeRootPath
) )
if ($PSCmdlet.ParameterSetName -eq "Version") {
$XcodeRootPath = Get-XcodeRootPath $Version
}
$licenseInfoPlistPath = Join-Path $XcodeRootPath "Contents" "Resources" "LicenseInfo.plist" $licenseInfoPlistPath = Join-Path $XcodeRootPath "Contents" "Resources" "LicenseInfo.plist"
$releaseType = & defaults read $licenseInfoPlistPath "licenseType" $releaseType = & defaults read $licenseInfoPlistPath "licenseType"
return -not ($releaseType -match "beta") return -not ($releaseType -match "beta")
@@ -103,16 +109,3 @@ function Get-XcodePairsList {
} }
return $result return $result
} }
function Test-XcodeStableVersion {
param([Parameter(Mandatory)][string]$Version)
if ($Version -match "beta") {
return $false
}
if ($Version -match "GM") {
return $false
}
return $true
}

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

@@ -56,7 +56,7 @@ Describe "Xcode" {
} }
Context "XCODE_DEVELOPER_DIR" { Context "XCODE_DEVELOPER_DIR" {
$stableXcodeVersions = $XCODE_VERSIONS | Where-Object { Test-XcodeStableVersion $_ } $stableXcodeVersions = $XCODE_VERSIONS | Where-Object { Test-XcodeStableRelease -Version $_ }
$majorXcodeVersions = $stableXcodeVersions | ForEach-Object { $_.Split(".")[0] } | Select-Object -Unique $majorXcodeVersions = $stableXcodeVersions | ForEach-Object { $_.Split(".")[0] } | Select-Object -Unique
$testCases = $majorXcodeVersions | ForEach-Object { $testCases = $majorXcodeVersions | ForEach-Object {
$majorXcodeVersion = $_ $majorXcodeVersion = $_
@@ -84,7 +84,7 @@ Describe "Xcode" {
} }
Describe "Xcode simulators" { Describe "Xcode simulators" {
$XCODE_VERSIONS | Where-Object { Test-XcodeStableVersion $_ } | ForEach-Object { $XCODE_VERSIONS | Where-Object { Test-XcodeStableRelease -Version $_ } | ForEach-Object {
Switch-Xcode -Version $_ Switch-Xcode -Version $_
Context "$_" { Context "$_" {