adrien
f3e94a3d53
- Political map country names were invisible because the label SVG had a zero-sized viewport, which some browsers never paint; size it to the world and guard it with a test. - Added a Devlog button showing the ten latest commits, generated into client/js/devlog_data.js by scripts/generate-devlog.js and refreshed by the pre-commit hook. - Worked through FIXME.md: the city button and a unit double-click now open the city, and the stat tooltip escapes the HUD so the unit panel cannot cover it. - The server creates its game at startup and clients only join it; the Create game screen and the configure_game path are gone, and testing is a --testing server flag. - A page on a loopback host signs in as adrien, claims France and gets the free, instant testing buttons, while the server grants free orders only to a loopback socket whose Origin is also loopback.
44 lines
1.6 KiB
Bash
Executable File
44 lines
1.6 KiB
Bash
Executable File
#!/bin/sh
|
|
# Pre-commit hook: run the Battle for 'Tismo test suite and refuse the
|
|
# commit when anything fails, then refresh the generated devlog the main menu
|
|
# shows. Installed by scripts/install-git-hooks.sh, which points the repository
|
|
# at this directory via core.hooksPath.
|
|
#
|
|
# Skip it once with: git commit --no-verify
|
|
|
|
set -e
|
|
|
|
# Locate the project root from this hook's own path, so the hook works no
|
|
# matter which directory the commit was invoked from.
|
|
PROJECT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)
|
|
cd "$PROJECT_DIR"
|
|
|
|
echo "pre-commit: running the test suite..."
|
|
|
|
if command -v node >/dev/null 2>&1; then
|
|
node tests/run_tests.js
|
|
elif command -v nodejs >/dev/null 2>&1; then
|
|
nodejs tests/run_tests.js
|
|
elif command -v nix-shell >/dev/null 2>&1; then
|
|
# Node is not on PATH; use the pinned nixpkgs one like the dev environment.
|
|
nix-shell -p nodejs --run "node tests/run_tests.js"
|
|
else
|
|
echo "pre-commit: no Node.js runtime found (looked for node, nodejs, nix-shell)." >&2
|
|
echo "pre-commit: install Node.js, or commit with --no-verify to skip the tests." >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Refresh the devlog the main menu shows and stage it, so the committed client
|
|
# always carries the latest commits. A failure here must not block the commit.
|
|
echo "pre-commit: refreshing the devlog..."
|
|
if command -v node >/dev/null 2>&1; then
|
|
node scripts/generate-devlog.js
|
|
elif command -v nodejs >/dev/null 2>&1; then
|
|
nodejs scripts/generate-devlog.js
|
|
else
|
|
nix-shell -p nodejs --run "node scripts/generate-devlog.js"
|
|
fi || echo "pre-commit: skipped the devlog refresh." >&2
|
|
if [ -f client/js/devlog_data.js ]; then
|
|
git add -- client/js/devlog_data.js
|
|
fi
|