Juke and JS version bump with github CI stuff (#344)

* Juke Build 0.8.1 (#60404)

* Juke Build 0.8.1 Hotfix 1 (#60897)

* Juke Build 0.8.1 Hotfix 1

* Do not restore Yarn cache on just DM build

* Improve Yarn caching in CI suite (#60962)

* cache and checkout v3

* nodejs

* bump

---------

Co-authored-by: Aleksej Komarov <[email protected]>

Author: Djiq

.github/workflows/ci_suite.yml

@@ -12,12 +12,20 @@ jobs:
     name: Run Linters
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup cache
-        uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - name: Restore SpacemanDMM cache
+        uses: actions/cache@v3
         with:
           path: ~/SpacemanDMM
-          key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }}
+          key: ${{ runner.os }}-spacemandmm
+      - name: Restore Yarn cache
+        uses: actions/cache@v3
+        with:
+          path: tgui/.yarn/cache
+          key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       - name: Install Tools
         run: |
           pip3 install setuptools
@@ -28,11 +36,9 @@ jobs:
         run: |
           bash tools/ci/check_filedirs.sh tgstation.dme
           bash tools/ci/check_changelogs.sh
-          find . -name "*.php" -print0 | xargs -0 -n1 php -l
-          find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python3 ./tools/json_verifier.py
-          tgui/bin/tgui --lint
-          tgui/bin/tgui --test
           bash tools/ci/check_grep.sh
+          bash tools/ci/check_misc.sh
+          tools/build/build --ci lint
           tools/bootstrap/python -m dmi.test
           tools/bootstrap/python -m mapmerge2.dmm_test
           ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
@@ -47,18 +53,17 @@ jobs:
     name: Compile Maps
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup cache
-        uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - name: Restore BYOND cache
+        uses: actions/cache@v3
         with:
           path: ~/BYOND
-          key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
+          key: ${{ runner.os }}-byond
       - name: Compile All Maps
         run: |
           bash tools/ci/install_byond.sh
           source $HOME/BYOND/byond/bin/byondsetup
-          python3 tools/ci/template_dm_generator.py
-          tools/build/build dm -DCIBUILDING -DCITESTING -DALL_MAPS
+          tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS
 
   run_all_tests:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
@@ -73,12 +78,24 @@ jobs:
           - 3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup cache
-        uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - name: Use Node.js 14.16.1
+        uses: actions/setup-node@v3
+        with:
+          node-version: 14.16.1
+      - name: Restore BYOND cache
+        uses: actions/cache@v3
         with:
           path: ~/BYOND
-          key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
+          key: ${{ runner.os }}-byond
+      - name: Restore Yarn cache
+        uses: actions/cache@v3
+        with:
+          path: tgui/.yarn/cache
+          key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       - name: Setup database
         run: |
           sudo systemctl start mysql
@@ -96,15 +113,27 @@ jobs:
         run: |
           bash tools/ci/install_byond.sh
           source $HOME/BYOND/byond/bin/byondsetup
-          tools/build/build -DCIBUILDING
+          tools/build/build --ci -DCIBUILDING
           bash tools/ci/run_server.sh
 
   test_windows:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Windows Build
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - name: Use Node.js 14.16.1
+        uses: actions/setup-node@v3
+        with:
+          node-version: 14.16.1
+      - name: Restore Yarn cache
+        uses: actions/cache@v3
+        with:
+          path: tgui/.yarn/cache
+          key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       - name: Compile
         run: pwsh tools/ci/build.ps1
         env:

.gitignore

@@ -12,8 +12,11 @@
 
 #Ignore compiled files and other files generated during compilation.
 *.mdme
+*.mdme.*
 *.dmb
 *.rsc
+*.m.dme
+*.test.dme
 *.lk
 *.int
 *.backup

CLEAN.bat

@@ -0,0 +1,3 @@
+@echo off
+call "%~dp0\tools\build\build.bat" dist-clean
+pause

RUN_SERVER.bat

@@ -0,0 +1,3 @@
+@echo off
+call "%~dp0\tools\build\build.bat" server %*
+pause

dependencies.sh

@@ -11,8 +11,8 @@ export BYOND_MINOR=1556
 export RUST_G_VERSION=0.5.0
 
 #node version
-export NODE_VERSION=12
-export NODE_VERSION_PRECISE=12.20.0
+export NODE_VERSION=14
+export NODE_VERSION_PRECISE=14.16.1
 
 # SpacemanDMM git tag
 export SPACEMAN_DMM_VERSION=suite-1.7

tgui/bin/tgui

@@ -92,7 +92,7 @@ task-clean() {
   rm -f .yarn/build-state.yml
   rm -f .yarn/install-state.gz
   rm -f .yarn/install-target
-  rm -f .pnp.js
+  rm -f .pnp.*
   ## NPM artifacts
   rm -rf **/node_modules
   rm -f **/package-lock.json

tgui/bin/tgui_.ps1

@@ -75,7 +75,7 @@ function task-clean {
   Remove-Quiet -Force ".yarn\build-state.yml"
   Remove-Quiet -Force ".yarn\install-state.gz"
   Remove-Quiet -Force ".yarn\install-target"
-  Remove-Quiet -Force ".pnp.js"
+  Remove-Quiet -Force ".pnp.*"
   ## NPM artifacts
   Get-ChildItem -Path "." -Include "node_modules" -Recurse -File:$false | Remove-Item -Recurse -Force
   Remove-Quiet -Force "package-lock.json"

tools/bootstrap/node

@@ -22,7 +22,7 @@ NodeVersion="$NODE_VERSION_PRECISE"
 NodeFullVersion="node-v$NodeVersion-win-x64"
 NodeDir="$Cache/$NodeFullVersion"
 NodeExe="$NodeDir/node.exe"
-Log="$Cache/last-command.log"
+is_vendored="1"
 
 # If a bootstrapped Node is not present, search on $PATH.
 if [ "$(uname)" = "Linux" ] || [ ! -f "$NodeExe" ]; then
@@ -39,6 +39,7 @@ if [ "$(uname)" = "Linux" ] || [ ! -f "$NodeExe" ]; then
 		fi
 	elif command -v node >/dev/null 2>&1; then
 		NodeExe="node"
+		is_vendored="0"
 	else
 		echo
 		if command -v apt-get >/dev/null 2>&1; then
@@ -62,23 +63,11 @@ if [ "$(uname)" = "Linux" ] || [ ! -f "$NodeExe" ]; then
 	fi
 fi
 
-# Cheap shell function if tee.exe is not available
-if ! command -v tee >/dev/null 2>&1; then
-	tee() {
-		# Fudge: assume $1 is always "-a"
-		while read -r line; do
-			echo "$line" >> "$2"
-			echo "$line"
-		done
-	}
-fi
-
 # Invoke Node with all command-line arguments
-mkdir -p "$Cache"
-printf '%s\n' "$NodeExe" "$@" > "$Log"
-printf -- '---\n' >> "$Log"
-exec 4>&1
-PATH="$(readlink -f "$NodeDir"):$PATH"  # Set PATH so that recursive calls find it
-exitstatus=$({ { set +e; "$NodeExe" "$@" 2>&1 3>&-; printf %s $? >&3; } 4>&- | tee -a "$Log" 1>&4; } 3>&1)
-exec 4>&-
-exit "$exitstatus"
+if [ "$is_vendored" = "1" ]; then
+	PATH="$(readlink -f "$NodeDir"):$PATH"
+	echo "Using vendored Node $("$NodeExe" --version)"
+else
+	echo "Using system-wide Node $("$NodeExe" --version)"
+fi
+exec "$NodeExe" "$@"

tools/build/README.md

@@ -13,6 +13,14 @@ This build script is the recommended way to compile the game, including not only
 
 The script will skip build steps whose inputs have not changed since the last run.
 
+## Getting list of available targets
+
+You can get a list of all targets that you can build by running the following command:
+
+```
+tools/build/build --help
+```
+
 ## Dependencies
 
 - On Windows, `BUILD.bat` will automatically install a private (vendored) copy of Node.