Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Metis
2024-10-19 17:56:57 -04:00
7 changed files with 70 additions and 32 deletions
+10 -1
View File
@@ -29,7 +29,16 @@ $Cache = "$BaseDir\.cache"
if ($Env:TG_BOOTSTRAP_CACHE) {
$Cache = $Env:TG_BOOTSTRAP_CACHE
}
$NodeVersion = Extract-Variable -Path "$BaseDir\..\..\dependencies.sh" -Key "NODE_VERSION_PRECISE"
# Get OS version
$OSMajor = (Get-WmiObject -Class Win32_OperatingSystem).Version.Split(".")[0]
# Set Node version based on OS version
if ($OSMajor -lt 10) {
# Anything under Windows 10
$NodeVersion = Extract-Variable -Path "$BaseDir\..\..\dependencies.sh" -Key "NODE_VERSION_COMPAT"
}
else {
$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"
+2 -2
View File
@@ -5,6 +5,6 @@ source dependencies.sh
if [[ -e ~/.nvm/nvm.sh ]]; then
source ~/.nvm/nvm.sh
nvm install $NODE_VERSION
nvm use $NODE_VERSION
nvm install $NODE_VERSION_COMPAT
nvm use $NODE_VERSION_COMPAT
fi
+4 -4
View File
@@ -1,7 +1,7 @@
pygit2==1.0.1
bidict==0.13.1
Pillow==10.0.1
pygit2==1.11.1
bidict==0.22.1
Pillow==10.3.0
# changelogs
PyYaml==5.4
PyYaml==6.0.1
beautifulsoup4==4.9.3