From 3c36bd210cdc1c3a61917fa1b3aa554d298affeb Mon Sep 17 00:00:00 2001 From: William Wallace Date: Sat, 29 Jan 2022 18:02:49 +0000 Subject: [PATCH] Change NodeJS on Windows to 64-bit, downgrade to v14.16.1 (#64513) * Change bootstrapped NodeJS on Windows from 32-bit to 64-bit * Last node version to support Win7 * Skip platform check Co-authored-by: Aleksej Komarov --- dependencies.sh | 4 ++-- tools/bootstrap/node.bat | 1 + tools/bootstrap/node_.ps1 | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dependencies.sh b/dependencies.sh index afec558e1b6..e154c99281c 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -11,8 +11,8 @@ export BYOND_MINOR=1560 export RUST_G_VERSION=0.5.0 #node version -export NODE_VERSION=16 -export NODE_VERSION_PRECISE=16.13.1 +export NODE_VERSION=14 +export NODE_VERSION_PRECISE=14.16.1 # SpacemanDMM git tag export SPACEMAN_DMM_VERSION=suite-1.7.1 diff --git a/tools/bootstrap/node.bat b/tools/bootstrap/node.bat index d934eadc8ca..a3fca88674d 100644 --- a/tools/bootstrap/node.bat +++ b/tools/bootstrap/node.bat @@ -1,4 +1,5 @@ @echo off +set NODE_SKIP_PLATFORM_CHECK=1 call powershell -NoLogo -ExecutionPolicy Bypass -File "%~dp0\node_.ps1" Download-Node for /f "tokens=* USEBACKQ" %%s in (` call powershell -NoLogo -ExecutionPolicy Bypass -File "%~dp0\node_.ps1" Get-Path diff --git a/tools/bootstrap/node_.ps1 b/tools/bootstrap/node_.ps1 index 38538c14f25..ac8d3b343f1 100644 --- a/tools/bootstrap/node_.ps1 +++ b/tools/bootstrap/node_.ps1 @@ -30,8 +30,8 @@ if ($Env:TG_BOOTSTRAP_CACHE) { $Cache = $Env:TG_BOOTSTRAP_CACHE } $NodeVersion = Extract-Variable -Path "$BaseDir\..\..\dependencies.sh" -Key "NODE_VERSION_PRECISE" -$NodeSource = "https://nodejs.org/download/release/v$NodeVersion/win-x86/node.exe" -$NodeTargetDir = "$Cache\node-v$NodeVersion" +$NodeSource = "https://nodejs.org/download/release/v$NodeVersion/win-x64/node.exe" +$NodeTargetDir = "$Cache\node-v$NodeVersion-x64" $NodeTarget = "$NodeTargetDir\node.exe" ## Just print the path and exit