From 6dc8234648564472f721007db2336b03cec1b8a1 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 12 Nov 2021 21:43:33 +0300 Subject: [PATCH] [macOS] Remove node version 10.x (#4477) --- images/macos/tests/Node.Tests.ps1 | 4 ++-- images/macos/toolsets/toolset-10.15.json | 5 ++--- images/macos/toolsets/toolset-11.json | 5 ++--- images/macos/toolsets/toolset-12.json | 5 ++--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/tests/Node.Tests.ps1 index baeab046..5f9e8734 100644 --- a/images/macos/tests/Node.Tests.ps1 +++ b/images/macos/tests/Node.Tests.ps1 @@ -42,8 +42,8 @@ Describe "nvm" { } Context "nvm versions" { - $NVM_VERSIONS = @(10, 12, 14) - $testCases = $NVM_VERSIONS | ForEach-Object { @{NvmVersion = $_} } + [array]$nvmVersions = Get-ToolsetValue 'node.nvm_versions' + $testCases = $nvmVersions | ForEach-Object { @{NvmVersion = $_} } It "" -TestCases $testCases { param ( diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 210fc172..76df1ffa 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -273,7 +273,6 @@ "platform" : "darwin", "arch": "x64", "versions": [ - "10.*", "12.*", "14.*", "16.*" @@ -334,9 +333,9 @@ "node": { "default": "14", "nvm_versions": [ - "10", "12", - "14" + "14", + "16" ] }, "llvm": { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index cda28c04..b2ef89a4 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -225,7 +225,6 @@ "platform" : "darwin", "arch": "x64", "versions": [ - "10.*", "12.*", "14.*", "16.*" @@ -286,9 +285,9 @@ "node": { "default": "14", "nvm_versions": [ - "10", "12", - "14" + "14", + "16" ] }, "llvm": { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 08ee9efd..3e0434f0 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -131,7 +131,6 @@ "platform" : "darwin", "arch": "x64", "versions": [ - "10.*", "12.*", "14.*", "16.*" @@ -187,9 +186,9 @@ "node": { "default": "14", "nvm_versions": [ - "10", "12", - "14" + "14", + "16" ] }, "mongodb": {