Skip to content

Commit

Permalink
Compiling the servers works again (tgstation#82420)
Browse files Browse the repository at this point in the history
"Compat" node version didn't work at all
  • Loading branch information
ZephyrTFA authored Apr 3, 2024
1 parent 6eb4567 commit 03d0076
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
3 changes: 1 addition & 2 deletions dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 1 addition & 12 deletions tools/bootstrap/node_.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 03d0076

Please sign in to comment.