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

fix nitpicks

Browse Source
This commit is contained in:
Maxim Lobanov
2020-11-11 13:24:11 +03:00
parent 772f80fadc
commit c656a9ddf2
4 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/macos/helpers/Common.Helpers.psm1
View File

@@ -84,7 +84,7 @@ function Invoke-RestMethodWithRetry {
Invoke-RestMethod $Url -MaximumRetryCount 10 -RetryIntervalSec 30 Invoke-RestMethod $Url -MaximumRetryCount 10 -RetryIntervalSec 30
} }
function Invoke-ExpressionWithValidation { function Invoke-ValidateCommand {
param( param(
[Parameter(Mandatory)] [Parameter(Mandatory)]
[string]$Command [string]$Command

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

@@ -30,7 +30,7 @@ function Invoke-DownloadXcodeArchive {
# TO-DO: Consider replacing of xcversion with own implementation # TO-DO: Consider replacing of xcversion with own implementation
Write-Host "Downloading Xcode $resolvedVersion" Write-Host "Downloading Xcode $resolvedVersion"
Invoke-ExpressionWithValidation "xcversion install '$resolvedVersion' --no-install" Invoke-ValidateCommand "xcversion install '$resolvedVersion' --no-install"
} }
function Resolve-ExactXcodeVersion { function Resolve-ExactXcodeVersion {
@@ -85,7 +85,7 @@ function Expand-XcodeXipArchive {
Write-Host "Extracting Xcode from '$xcodeXipPath'" Write-Host "Extracting Xcode from '$xcodeXipPath'"
Push-Location $DownloadDirectory Push-Location $DownloadDirectory
Invoke-ExpressionWithValidation "xip -x $xcodeXipPath" Invoke-ValidateCommand "xip -x $xcodeXipPath"
Pop-Location Pop-Location
if (Test-Path "$DownloadDirectory/Xcode-beta.app") { if (Test-Path "$DownloadDirectory/Xcode-beta.app") {
@@ -110,7 +110,7 @@ function Confirm-XcodeIntegrity {
$XcodeRootPath = Get-XcodeRootPath -Version $Version $XcodeRootPath = Get-XcodeRootPath -Version $Version
if (Test-XcodeStableRelease -XcodeRootPath $XcodeRootPath) { if (Test-XcodeStableRelease -XcodeRootPath $XcodeRootPath) {
Write-Host "Validating Xcode integrity for '$XcodeRootPath'..." Write-Host "Validating Xcode integrity for '$XcodeRootPath'..."
Invoke-ExpressionWithValidation "spctl --assess --raw $XcodeRootPath" Invoke-ValidateCommand "spctl --assess --raw $XcodeRootPath"
} }
} }
@@ -123,7 +123,7 @@ function Approve-XcodeLicense {
$XcodeRootPath = Get-XcodeRootPath -Version $Version $XcodeRootPath = Get-XcodeRootPath -Version $Version
Write-Host "Approving Xcode license for '$XcodeRootPath'..." Write-Host "Approving Xcode license for '$XcodeRootPath'..."
$xcodeBuildPath = Get-XcodeToolPath -XcodeRootPath $XcodeRootPath -ToolName "xcodebuild" $xcodeBuildPath = Get-XcodeToolPath -XcodeRootPath $XcodeRootPath -ToolName "xcodebuild"
Invoke-ExpressionWithValidation "sudo $xcodeBuildPath -license accept" Invoke-ValidateCommand "sudo $xcodeBuildPath -license accept"
} }
function Install-XcodeAdditionalPackages { function Install-XcodeAdditionalPackages {
@@ -136,7 +136,7 @@ function Install-XcodeAdditionalPackages {
$xcodeRootPath = Get-XcodeRootPath -Version $Version $xcodeRootPath = Get-XcodeRootPath -Version $Version
$packages = Get-ChildItem -Path "$xcodeRootPath/Contents/Resources/Packages" -Filter "*.pkg" -File $packages = Get-ChildItem -Path "$xcodeRootPath/Contents/Resources/Packages" -Filter "*.pkg" -File
$packages | ForEach-Object { $packages | ForEach-Object {
Invoke-ExpressionWithValidation "sudo installer -pkg $($_.FullName) -target / -allowUntrusted" Invoke-ValidateCommand "sudo installer -pkg $($_.FullName) -target / -allowUntrusted"
} }
} }
@@ -152,7 +152,7 @@ function Invoke-XcodeRunFirstLaunch {
Write-Host "Running 'runFirstLaunch' for Xcode $Version..." Write-Host "Running 'runFirstLaunch' for Xcode $Version..."
$xcodeRootPath = Get-XcodeToolPath -Version $Version -ToolName "xcodebuild" $xcodeRootPath = Get-XcodeToolPath -Version $Version -ToolName "xcodebuild"
Invoke-ExpressionWithValidation "sudo $xcodeRootPath -runFirstLaunch" Invoke-ValidateCommand "sudo $xcodeRootPath -runFirstLaunch"
} }
function Build-XcodeSymlinks { function Build-XcodeSymlinks {

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

@@ -1,8 +1,6 @@
# The script currently requires 2 external variables to be set: XCODE_INSTALL_USER # The script currently requires 2 external variables to be set: XCODE_INSTALL_USER
# and XCODE_INSTALL_PASSWORD, in order to access the Apple Developer Center # and XCODE_INSTALL_PASSWORD, in order to access the Apple Developer Center
Write-Host "Script begin"
$ErrorActionPreference = "Stop" $ErrorActionPreference = "Stop"
Import-Module "$env:HOME/image-generation/helpers/Common.Helpers.psm1" Import-Module "$env:HOME/image-generation/helpers/Common.Helpers.psm1"

26
images/macos/toolsets/toolset-10.13.json
View File

@@ -2,19 +2,19 @@
"xcode": { "xcode": {
"default": "10.1", "default": "10.1",
"versions": [ "versions": [
{ "link": "10.1", "version": "10.1.0", "symlinks": [ "10.1_beta"] }, { "link": "10.1", "version": "10.1.0", "symlinks": ["10.1_beta"] },
{ "link": "10", "version": "10.0.0", "symlinks": [ "10_beta"] }, { "link": "10", "version": "10.0.0", "symlinks": ["10_beta"] },
{ "link": "9.4.1", "version": "9.4.1", "symlinks": [ "9.4.1_beta"] }, { "link": "9.4.1", "version": "9.4.1", "symlinks": ["9.4.1_beta"] },
{ "link": "9.4", "version": "9.4.0", "symlinks": [ "9.4_beta"] }, { "link": "9.4", "version": "9.4.0", "symlinks": ["9.4_beta"] },
{ "link": "9.3.1", "version": "9.3.1", "symlinks": [ "9.3.1_beta"] }, { "link": "9.3.1", "version": "9.3.1", "symlinks": ["9.3.1_beta"] },
{ "link": "9.3", "version": "9.3.0", "symlinks": [ "9.3_beta"] }, { "link": "9.3", "version": "9.3.0", "symlinks": ["9.3_beta"] },
{ "link": "9.2", "version": "9.2.0", "symlinks": [ "9.2_beta"] }, { "link": "9.2", "version": "9.2.0", "symlinks": ["9.2_beta"] },
{ "link": "9.1", "version": "9.1.0", "symlinks": [ "9.1_beta"] }, { "link": "9.1", "version": "9.1.0", "symlinks": ["9.1_beta"] },
{ "link": "9", "version": "9.0.0", "symlinks": [ "9_beta"] }, { "link": "9", "version": "9.0.0", "symlinks": ["9_beta"] },
{ "link": "8.3.3", "version": "8.3.3", "symlinks": [ "8.3.3_beta"] }, { "link": "8.3.3", "version": "8.3.3", "symlinks": ["8.3.3_beta"] },
{ "link": "8.2.1", "version": "8.2.1", "symlinks": [ "8.2.1_beta"] }, { "link": "8.2.1", "version": "8.2.1", "symlinks": ["8.2.1_beta"] },
{ "link": "8.1", "version": "8.1.0", "symlinks": [ "8.1_beta"] }, { "link": "8.1", "version": "8.1.0", "symlinks": ["8.1_beta"] },
{ "link": "8", "version": "8.0.0", "symlinks": [ "8_beta"] } { "link": "8", "version": "8.0.0", "symlinks": ["8_beta"] }
] ]
}, },
"xamarin": { "xamarin": {