server: tooling minor update (#5988)

.gitattributes

@@ -35,10 +35,14 @@
 *.png binary
 *.so binary
 
-## Merger hooks, run tools/hooks/install.bat or install.sh to set up
+## Merge hooks, run tools/hooks/install.bat or install.sh to set up
 *.dmm text eol=lf merge=dmm
 *.dmi binary merge=dmi
 
+## TGUI bundle merge drivers
+*.bundle.* binary merge=tgui-merge-bundle
+*.chunk.* binary merge=tgui-merge-bundle
+
 ## Force tab indents on dm files
 *.dm whitespace=indent-with-non-tab
 

.github/workflows/ci.yml

@@ -21,6 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
+
       - name: Setup Cache
         uses: actions/cache@v4
         with:
@@ -37,13 +38,19 @@ jobs:
           python-version: '3.11.6'
           cache: 'pip'
 
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'yarn'
+          cache-dependency-path: ./tgui/yarn.lock
+
       - name: Install python packages
         run: pip3 install -r tools/requirements.txt
 
       - name: Run Linters
         run: |
           find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python3 ./tools/ci/json_verifier.py
-          tools/ci/build_tgui.sh
+          tgui/bin/tgui --ci
           tools/ci/check_grep.sh
           python3 tools/ci/check_line_endings.py
           python3 tools/ci/unticked_files.py ${GITHUB_WORKSPACE}

_build_dependencies.sh

@@ -1,8 +1,8 @@
 # This file has all the information on what versions of libraries are thrown into the code
 # For dreamchecker
-export SPACEMANDMM_TAG=suite-1.8
+export SPACEMANDMM_TAG=suite-1.9
 # For TGUI
-export NODE_VERSION=18
+export NODE_VERSION=20
 # Stable Byond Major
 export STABLE_BYOND_MAJOR=515
 # Stable Byond Minor

tools/ci/install_build_deps.sh

@@ -3,8 +3,4 @@ set -euo pipefail
 
 source _build_dependencies.sh
 
-source ~/.nvm/nvm.sh
-nvm install $NODE_VERSION
-nvm use $NODE_VERSION
-npm install --global yarn
-
+# nothing to do here right now

tools/hooks/Install.bat

@@ -1,2 +1,18 @@
 @call "%~dp0\..\bootstrap\python" -m hooks.install %*
-@pause
+@echo off
+set /p choice=Do you want to install TGUI hooks (requires Node.js)? (Y/N):
+
+if /i "%choice%"=="Y" (
+    @echo off
+	rem Copyright (c) 2020 Aleksej Komarov
+	rem SPDX-License-Identifier: MIT
+	call powershell.exe -NoLogo -ExecutionPolicy Bypass -File "%~dp0\..\..\tgui\bin\tgui_.ps1" --install-git-hooks %*
+	rem Pause if launched in a separate shell unless initiated from powershell
+	echo %PSModulePath% | findstr %USERPROFILE% >NUL
+	if %errorlevel% equ 0 (
+		pause
+		exit 0
+		)
+	echo %cmdcmdline% | find /i "/c"
+)
+pause

tools/hooks/Uninstall.bat

@@ -1,2 +1,3 @@
 @call "%~dp0\..\bootstrap\python" -m hooks.install --uninstall %*
+git config --unset merge.tgui-merge-bundle.driver
 @pause