actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2026-01-18 18:30:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1973 from maxim-lobanov/v-malob/macos-depr

Browse Source 
Deprecate old Xcode versions on MacOS image, update Node.JS to 14.0
This commit is contained in:
Maxim Lobanov
2020-11-05 17:53:04 +03:00
committed by GitHub
parent ff49068542 5fac646209
commit f93cb491a5
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
images/macos/provision/core/node.sh
View File

@@ -27,8 +27,8 @@ if is_Less_Catalina; then
npm install -g appcenter-cli@^1.0.0
else
# Install Node.JS 12 for macOS >= 10.15
brew install node@12
brew link node@12 --force
brew install node@14
brew link node@14 --force
for module in ${node_modules[@]}; do
echo "Install $module"

1
images/macos/provision/core/xcode-tools.sh
View File

@@ -77,6 +77,7 @@ runFirstLaunch $DEFAULT_XCODE_VERSION
if is_Catalina; then
ln -sf /Applications/Xcode_11.2.1.app /Applications/Xcode_11.2.app
ln -sf /Applications/Xcode_11.3.1.app /Applications/Xcode_11.3.app
ln -sf /Applications/Xcode_11.4.1.app /Applications/Xcode_11.4.app
fi
echo "Setting Xcode ${DEFAULT_XCODE_VERSION} as default"

6
images/macos/tests/Node.Tests.ps1
View File

@@ -4,7 +4,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
Describe "Node.JS" {
BeforeAll {
$os = Get-OSVersion
$expectedNodeVersion = if ($os.IsHigherThanMojave) { "v12.*" } else { "v8.*" }
$expectedNodeVersion = if ($os.IsHigherThanMojave) { "v14.*" } else { "v8.*" }
}
It "Node.JS is installed" {
@@ -29,7 +29,7 @@ Describe "NVM" {
$nvmPath = Join-Path $env:HOME ".nvm" "nvm.sh"
$nvmInitCommand = ". $nvmPath > /dev/null 2>&1 || true"
}
It "Nvm is installed" {
$nvmPath | Should -Exist
"$nvmInitCommand && nvm --version" | Should -ReturnZeroExitCode
@@ -43,7 +43,7 @@ Describe "NVM" {
param (
[string] $NvmVersion
)
"$nvmInitCommand && nvm ls $($NvmVersion)" | Should -ReturnZeroExitCode
}
}

4
images/macos/toolsets/toolset-10.15.json
View File

@@ -2,7 +2,7 @@
"xcode": {
"default": "12",
"versions": [
"12.2_beta", "12.1", "12", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3"
"12.2_beta", "12.1", "12", "11.7", "11.6", "11.5", "11.4.1", "11.3.1", "11.2.1", "10.3"
]
},
"xamarin": {
@@ -168,8 +168,6 @@
"arch": "x64",
"platform" : "darwin",
"versions": [
"1.11.*",
"1.12.*",
"1.13.*",
"1.14.*",
"1.15.*"