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

Deprecate old Xcode versions on MacOS image, update Node.JS to 14.0
actions · Nov 5, 2020 · f93cb49 · f93cb49
2 parents ff49068 + 5fac646
commit f93cb49
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh
@@ -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"

diff --git a/images/macos/provision/core/xcode-tools.sh b/images/macos/provision/core/xcode-tools.sh
@@ -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"

diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/tests/Node.Tests.ps1
@@ -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
         }
     }

diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
@@ -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.*"