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

[MacOS] Exclude release candidates from XCODE_DEVELOPER_DIR variables (#1998)

Browse Source 
* exclude release candidates from XCODE_DEVELOPER_DIR

* Update Xcode.Tests.ps1
This commit is contained in:
Maxim Lobanov
2020-11-06 22:13:28 +03:00
committed by GitHub
parent 4755c5caba
commit fa9109cc62
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/macos/provision/utils/xcode-utils.sh
View File

@@ -55,7 +55,7 @@ runFirstLaunch() {
} }
setXcodeDeveloperDirVariables() { setXcodeDeveloperDirVariables() {
stable_xcode_versions=$(get_xcode_list_from_toolset | tr " " "\n" | grep -v "beta") stable_xcode_versions=$(get_xcode_list_from_toolset | tr " " "\n" | grep -v "beta" | grep -v "Release_Candidate")
major_versions=($(echo ${stable_xcode_versions[@]} | tr " " "\n" | cut -d '.' -f 1 | uniq)) major_versions=($(echo ${stable_xcode_versions[@]} | tr " " "\n" | cut -d '.' -f 1 | uniq))
for MAJOR_VERSION in "${major_versions[@]}" for MAJOR_VERSION in "${major_versions[@]}"
do do

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 | ForEach-Object { $_.Split("_")[0] } | Where-Object { Test-XcodeStableRelease -Version $_ } $stableXcodeVersions = $XCODE_VERSIONS | Where-Object { $_ -notlike "*Release*Candidate*" } | ForEach-Object { $_.Split("_")[0] } | 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-XcodeStableRelease -Version $_ } | ForEach-Object { $XCODE_VERSIONS | Where-Object { $_ -notlike "*Release*Candidate*" } | ForEach-Object { $_.Split("_")[0] } | Where-Object { Test-XcodeStableRelease -Version $_ } | ForEach-Object {
Switch-Xcode -Version $_ Switch-Xcode -Version $_
Context "$_" { Context "$_" {