Skip to content

Commit 58ce149

Browse files
[MacOS] Rework NodeJS install (#4380)
1 parent fa41b67 commit 58ce149

File tree

7 files changed

+44
-5
lines changed

7 files changed

+44
-5
lines changed

images/macos/provision/core/node.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ if is_Less_Catalina; then
1010
rm -rf "${TMP_FILE}"
1111
sudo chown -R $USER "/usr/local/lib/node_modules"
1212
else
13-
# Install Node.js 14 for macOS >= 10.15
14-
brew_smart_install "node@14"
15-
brew link node@14 --force
13+
# Install default Node.js for macOS >= 10.15
14+
defaultVersion=$(get_toolset_value '.node.default')
15+
16+
echo "Installing Node.js $defaultVersion"
17+
brew_smart_install "node@$defaultVersion"
18+
brew link node@$defaultVersion --force
1619
fi
1720

1821
echo Installing yarn...

images/macos/provision/core/nvm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash
1111
if [ $? -eq 0 ]; then
1212
. ~/.bashrc
1313
nvm --version
14-
nodeVersions=("v10" "v12" "v14")
14+
nodeVersions=$(get_toolset_value '.node.nvm_versions[]')
1515
for version in ${nodeVersions[@]}
1616
do
17-
nvm install $version
17+
nvm install v${version}
1818
done
1919

2020
# set system node as default

images/macos/tests/Node.Tests.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ Describe "Node.js" {
1313
"node --version" | Should -ReturnZeroExitCode
1414
}
1515

16+
It "Node.js version should correspond to the version in the toolset" {
17+
node --version | Should -BeLike "v$(Get-ToolsetValue 'node.default')*"
18+
}
19+
1620
It "Node.js $expectedNodeVersion is default" {
1721
(Get-CommandResult "node --version").Output | Should -BeLike $expectedNodeVersion
1822
}

images/macos/toolsets/toolset-10.14.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,5 +375,13 @@
375375
},
376376
"go": {
377377
"default": "1.15"
378+
},
379+
"node": {
380+
"default": "8",
381+
"nvm_versions": [
382+
"10",
383+
"12",
384+
"14"
385+
]
378386
}
379387
}

images/macos/toolsets/toolset-10.15.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,5 +331,13 @@
331331
},
332332
"go": {
333333
"default": "1.15"
334+
},
335+
"node": {
336+
"default": "14",
337+
"nvm_versions": [
338+
"10",
339+
"12",
340+
"14"
341+
]
334342
}
335343
}

images/macos/toolsets/toolset-11.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,5 +284,13 @@
284284
},
285285
"go": {
286286
"default": "1.15"
287+
},
288+
"node": {
289+
"default": "14",
290+
"nvm_versions": [
291+
"10",
292+
"12",
293+
"14"
294+
]
287295
}
288296
}

images/macos/toolsets/toolset-12.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,5 +184,13 @@
184184
},
185185
"go": {
186186
"default": "1.17"
187+
},
188+
"node": {
189+
"default": "14",
190+
"nvm_versions": [
191+
"10",
192+
"12",
193+
"14"
194+
]
187195
}
188196
}

0 commit comments

Comments
 (0)