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

[macos] Utilise arch helper function (#8036)

Browse Source
This commit is contained in:
Shamil Mubarakshin
2023-08-03 18:20:16 +02:00
committed by GitHub
parent b762375cfc
commit ff6a3d4b29
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
images/macos/provision/core/xcode.ps1
View File

@@ -7,8 +7,7 @@ Import-Module "$env:HOME/image-generation/helpers/Xcode.Installer.psm1" -Disable
# https://github.com/fastlane/fastlane/pull/18116 # https://github.com/fastlane/fastlane/pull/18116
$env:SPACESHIP_SKIP_2FA_UPGRADE = 1 $env:SPACESHIP_SKIP_2FA_UPGRADE = 1
$ARCH = arch $ARCH = Get-Architecture
if ($ARCH -ne "arm64") { $ARCH = "x64" }
[Array]$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" [Array]$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions"
write-host $xcodeVersions write-host $xcodeVersions
$defaultXcode = Get-ToolsetValue "xcode.default" $defaultXcode = Get-ToolsetValue "xcode.default"

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

@@ -2,8 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1"
Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
$ARCH = arch $ARCH = Get-Architecture
if ($ARCH -ne "arm64") { $ARCH = "x64" }
$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" $xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions"
$defaultXcode = Get-ToolsetValue "xcode.default" $defaultXcode = Get-ToolsetValue "xcode.default"
$latestXcodeVersion = $xcodeVersions | Select-Object -First 1 $latestXcodeVersion = $xcodeVersions | Select-Object -First 1