From 03d0076f7dc2a25859ef83adc11aca8abe9aa2a7 Mon Sep 17 00:00:00 2001 From: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> Date: Wed, 3 Apr 2024 02:53:10 -0400 Subject: [PATCH] Compiling the servers works again (#82420) "Compat" node version didn't work at all --- dependencies.sh | 3 +-- tools/bootstrap/node_.ps1 | 13 +------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dependencies.sh b/dependencies.sh index 300e2826c6f..087c337a046 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -11,9 +11,8 @@ export BYOND_MINOR=1633 export RUST_G_VERSION=3.1.0 #node version -export NODE_VERSION=14 +export NODE_VERSION=20 export NODE_VERSION_LTS=20.12.0 -export NODE_VERSION_COMPAT=14.16.1 # SpacemanDMM git tag export SPACEMAN_DMM_VERSION=suite-1.8 diff --git a/tools/bootstrap/node_.ps1 b/tools/bootstrap/node_.ps1 index d56d6f457bf..31cca39d141 100644 --- a/tools/bootstrap/node_.ps1 +++ b/tools/bootstrap/node_.ps1 @@ -31,18 +31,7 @@ if ($Env:TG_BOOTSTRAP_CACHE) { $Cache = $Env:TG_BOOTSTRAP_CACHE } -# Get OS version -$OSVersion = (Get-WmiObject -Class Win32_OperatingSystem).Version - -# Set Node version based on OS version -if ($OSVersion -gt 6.1) { - # Windows 7 is version 6.1 - $NodeVersion = Extract-Variable -Path "$BaseDir\..\..\dependencies.sh" -Key "NODE_VERSION_COMPAT" -} -else { - $NodeVersion = Extract-Variable -Path "$BaseDir\..\..\dependencies.sh" -Key "NODE_VERSION_LTS" -} - +$NodeVersion = Extract-Variable -Path "$BaseDir\..\..\dependencies.sh" -Key "NODE_VERSION_LTS" $NodeSource = "https://nodejs.org/download/release/v$NodeVersion/win-x64/node.exe" $NodeTargetDir = "$Cache\node-v$NodeVersion-x64" $NodeTarget = "$NodeTargetDir\node.exe"