File tree Expand file tree Collapse file tree 7 files changed +44
-5
lines changed Expand file tree Collapse file tree 7 files changed +44
-5
lines changed Original file line number Diff line number Diff 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"
1212else
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
1619fi
1720
1821echo Installing yarn...
Original file line number Diff line number Diff line change @@ -11,10 +11,10 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash
1111if [ $? -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
Original file line number Diff line number Diff 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 }
Original file line number Diff line number Diff line change 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}
Original file line number Diff line number Diff line change 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}
Original file line number Diff line number Diff line change 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}
Original file line number Diff line number Diff line change 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}
You can’t perform that action at this time.
0 commit comments