meleki/feuerwerk
1
0 Fork 0
Code Issues 38 Actions Projects 1 Wiki Activity

Move repo, CI and the video worker over to the name Feuerwerk (#422)
feuerwerk / gate (push) Successful in 4m30s
Details
feuerwerk / suite (push) Successful in 18m38s
Details

Browse Source 
Stage 3 of the rename. The repo now lives at meleki/feuerwerk, the
runners carry feuerwerk labels and the WSL distro on melektaus-atx is
called feuerwerk-ci. The code has to follow, or CI finds no runner and
the suite no longer picks the GPU path.

- ci.yml: workflow name feuerwerk, jobs on feuerwerk-ci (gate, stein2)
  and feuerwerk-wsl (suite, melektaus-atx).
- GAME_MAKER_* variables are now FEUERWERK_*. This includes
  FEUERWERK_BROWSER=wsl, which the runner config on melektaus-atx sets.
- The video worker runs as container feuerwerk-video with the image
  feuerwerk-video and works on /srv/feuerwerk.
- e2e.sh starts the unit feuerwerk-e2e, the CI image keeps its paths
  under the new name.
- README and repo links point to git.nockal.com/meleki/feuerwerk. The
  old URLs still redirect with 301.

Both runners keep their old labels until the first CI run with this
ci.yml is through. Then they go, together with the image tag
game-maker-ci:latest and GAME_MAKER_BROWSER in the atx config.

Tests:
- Gate on melektaus-atx through the renamed distro: CHECK EXIT 0,
  307 files, 4756 tests.
- e2e 60 on melektaus-atx: ALL PASSED, 20 checks. Renderer is the
  RTX 4070 through D3D12, so FEUERWERK_BROWSER reaches the GPU path.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
adminandClaude Opus 5.5 committed 2026-10-13 13:42:52 +02:00
1 parent 043c224cc3
commit 6097307b6d
16 files changed
+78 -78
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/ci/Dockerfile
+4 -4
View File
@@ -1,7 +1,7 @@
# The image behind the Gitea Actions label `game-maker-ci`. It is built on the host and kept
# The image behind the Gitea Actions label `feuerwerk-ci`. It is built on the host and kept
# local (the runner has `force_pull: false`), so a change here needs a rebuild:
#
# DOCKER_BUILDKIT=0 docker build --network git_default -t game-maker-ci:latest tools/ci
# DOCKER_BUILDKIT=0 docker build --network git_default -t feuerwerk-ci:latest tools/ci
#
# Both flags are needed on stein2: DNS is dead in Docker's default bridge network, and Buildkit
# cannot join a named network.
@@ -10,11 +10,11 @@ FROM node:22-bookworm
# chromium + the Vulkan drivers: the e2e harness starts chromium with --use-angle=vulkan and has
# no software fallback. The render device itself comes from the runner's container.options;
# without it chromium falls back to llvmpipe and gets WebGL 1.0 only.
# xvfb serves the other GPU path, GAME_MAKER_BROWSER=wsl (tools/lib/browser.mjs): under WSL2 the
# xvfb serves the other GPU path, FEUERWERK_BROWSER=wsl (tools/lib/browser.mjs): under WSL2 the
# GPU is /dev/dxg behind Mesa's d3d12 driver, which headless chromium cannot reach, an X11 one can.
# php-cli serves api/index.php, which every tool loads and saves its project through.
# ffmpeg converts uploaded videos (#402), through tools/video-worker.php like the container
# game-maker-video on stein2 does.
# feuerwerk-video on stein2 does.
# The fonts are the host's set on purpose: the checks measure text widths to find click points,
# so a different set moves them.
RUN apt-get update && apt-get install -y --no-install-recommends \
tools/ci/serve.sh
+8 -8
View File
@@ -1,11 +1,11 @@
#!/bin/bash
# Sourced, not run: it leaves the PHP server in the caller's background and exports
# GAME_MAKER_BASE_URL, which every tool reads.
# FEUERWERK_BASE_URL, which every tool reads.
#
# The build wires its assets absolutely under /feuerwerk/dist/, so the checkout has to be
# served under that path segment – hence the symlink into /srv rather than `-t .`.
export GAME_MAKER_BASE_URL=http://127.0.0.1:8080/feuerwerk/
export FEUERWERK_BASE_URL=http://127.0.0.1:8080/feuerwerk/
feuerwerk_serve() {
local root
@@ -30,27 +30,27 @@ feuerwerk_serve() {
# A server from an earlier step of the same job is fine to keep. Asked of the one route that
# answers without a session, so "is it up" does not depend on being signed in.
if curl -sf "${GAME_MAKER_BASE_URL}api/index.php?r=auth/session" >/dev/null 2>&1; then
echo "server already up at $GAME_MAKER_BASE_URL"
if curl -sf "${FEUERWERK_BASE_URL}api/index.php?r=auth/session" >/dev/null 2>&1; then
echo "server already up at $FEUERWERK_BASE_URL"
return 0
fi
mkdir -p /srv && ln -sfn "$root" /srv/feuerwerk
# Uploaded videos are converted by the worker (#402); on stein2 that is the container
# game-maker-video, here a process beside the server.
# feuerwerk-video, here a process beside the server.
php "$root/tools/video-worker.php" "$root/data" >/tmp/video-worker.log 2>&1 &
# Without workers the single-threaded dev server stalls: the editor fetches project and
# textures in parallel. The router serves videos with Range requests, see there.
PHP_CLI_SERVER_WORKERS=8 php -S 0.0.0.0:8080 -t /srv "$root/tools/ci/router.php" >/tmp/php-server.log 2>&1 &
for _ in $(seq 60); do
curl -sf "${GAME_MAKER_BASE_URL}api/index.php?r=auth/session" >/dev/null 2>&1 && break
curl -sf "${FEUERWERK_BASE_URL}api/index.php?r=auth/session" >/dev/null 2>&1 && break
sleep 0.5
done
if ! curl -sf "${GAME_MAKER_BASE_URL}api/index.php?r=auth/session" >/dev/null 2>&1; then
if ! curl -sf "${FEUERWERK_BASE_URL}api/index.php?r=auth/session" >/dev/null 2>&1; then
echo "the server never came up" >&2
tail -20 /tmp/php-server.log >&2
return 1
fi
echo "serving $root at $GAME_MAKER_BASE_URL"
echo "serving $root at $FEUERWERK_BASE_URL"
}
tools/e2e/66-video.mjs
+1 -1
View File
@@ -5,7 +5,7 @@ import { sampleZoom } from './lib/zoomTransition.mjs';
/**
* Videos (#402). A WebM goes up and the worker turns it into an MP4 (in CI beside the PHP server,
* on stein2 in the container game-maker-video). "+ → Video" offers it with what it is; Use makes
* on stein2 in the container feuerwerk-video). "+ → Video" offers it with what it is; Use makes
* the asset and opens its tab, which shows the picture. A drag in the clip strip spans a clip, one
* undo step. A sprite wearing the clip plays only that stretch, over and over, without sound in the
* editor; Play starts it over from the clip's start and lets it be heard, Esc makes it quiet again.
tools/lib/auth.mjs
+6 -6
View File
@@ -2,7 +2,7 @@
* Signing the check tools in. Since #177 every API route but `auth/*` needs a session, so every
* seed, smoke and e2e run logs in first – as `e2e`, the account that owns the four test projects.
*
* The password is never in the repo: it comes from `GAME_MAKER_E2E_PASSWORD` or from
* The password is never in the repo: it comes from `FEUERWERK_E2E_PASSWORD` or from
* `data/e2e-password.txt`, which is git-ignored and written once per server (CI writes its own).
*/
import { readFile } from 'node:fs/promises';
@@ -23,26 +23,26 @@ const cookies = new Map();
/** The password of the `e2e` account; the step that drives the sign-in screen types it in. */
export async function e2ePassword() {
const fromEnv = process.env.GAME_MAKER_E2E_PASSWORD;
const fromEnv = process.env.FEUERWERK_E2E_PASSWORD;
if (fromEnv) return fromEnv;
try {
return (await readFile(PASSWORD_FILE, 'utf8')).trim();
} catch {
throw new Error(
`no password for the "${E2E_USER}" account: set GAME_MAKER_E2E_PASSWORD or put it in ${PASSWORD_FILE}`,
`no password for the "${E2E_USER}" account: set FEUERWERK_E2E_PASSWORD or put it in ${PASSWORD_FILE}`,
);
}
}
/** The password of `e2e-admin`, from `GAME_MAKER_E2E_ADMIN_PASSWORD` or `data/e2e-admin-password.txt`. */
/** The password of `e2e-admin`, from `FEUERWERK_E2E_ADMIN_PASSWORD` or `data/e2e-admin-password.txt`. */
export async function e2eAdminPassword() {
const fromEnv = process.env.GAME_MAKER_E2E_ADMIN_PASSWORD;
const fromEnv = process.env.FEUERWERK_E2E_ADMIN_PASSWORD;
if (fromEnv) return fromEnv;
try {
return (await readFile(ADMIN_PASSWORD_FILE, 'utf8')).trim();
} catch {
throw new Error(
`no password for the "${E2E_ADMIN}" account: set GAME_MAKER_E2E_ADMIN_PASSWORD or put it in ${ADMIN_PASSWORD_FILE}`,
`no password for the "${E2E_ADMIN}" account: set FEUERWERK_E2E_ADMIN_PASSWORD or put it in ${ADMIN_PASSWORD_FILE}`,
);
}
}
tools/lib/browser.mjs
+2 -2
View File
@@ -30,7 +30,7 @@ const HEADLESS = [
];
/**
* GAME_MAKER_BROWSER=wsl, for a runner inside WSL2 (#283). There the GPU is /dev/dxg behind Mesa's
* FEUERWERK_BROWSER=wsl, for a runner inside WSL2 (#283). There the GPU is /dev/dxg behind Mesa's
* d3d12 driver: no DRM render node, no Vulkan. Headless chromium finds no surface and gets no WebGL,
* an X11 chromium on ANGLE/GL does. So this mode brings its own invisible X server.
*
@@ -49,7 +49,7 @@ const WSL = [
/** Starts chromium with the CDP port open; `proc.stderr` carries its last words. */
export async function launchBrowser({ port, width, height }) {
const wsl = process.env.GAME_MAKER_BROWSER === 'wsl';
const wsl = process.env.FEUERWERK_BROWSER === 'wsl';
const display = wsl ? await startXvfb({ width, height }) : null;
const proc = spawn(
'chromium',
tools/lib/projects.mjs
+2 -2
View File
@@ -26,13 +26,13 @@ export const DEFAULT_BASE_URL = 'https://nockal.com/feuerwerk/';
/**
* Reads `[projectId] [baseUrl]` from argv, falling back to `defaultId` and to
* `GAME_MAKER_BASE_URL` – which is how CI points every tool at its own server without
* `FEUERWERK_BASE_URL` – which is how CI points every tool at its own server without
* repeating the project ids in shell scripts. Targeting the playground aborts: no tool may
* overwrite or mutate it.
*/
export function cliArgs(script, defaultId) {
const projectId = process.argv[2] ?? defaultId;
const baseUrl = process.argv[3] ?? process.env.GAME_MAKER_BASE_URL ?? DEFAULT_BASE_URL;
const baseUrl = process.argv[3] ?? process.env.FEUERWERK_BASE_URL ?? DEFAULT_BASE_URL;
if (projectId === PROJECTS.playground) {
console.error(`refusing to run ${script} against the playground project (${PROJECTS.playground}).`);
process.exit(2);
tools/video-worker.php
+1 -1
View File
@@ -7,7 +7,7 @@ declare(strict_types=1);
* php tools/video-worker.php [datadir] keeps watching the queue
* php tools/video-worker.php [datadir] --once converts what waits now, then stops
*
* On stein2 it runs in the container `game-maker-video` (tools/video/), in CI beside the PHP
* On stein2 it runs in the container `feuerwerk-video` (tools/video/), in CI beside the PHP
* server (tools/ci/serve.sh). Both need ffmpeg and ffprobe on the PATH.
*/
tools/video/Dockerfile
+2 -2
View File
@@ -1,11 +1,11 @@
# The image of the container `game-maker-video` (#402): PHP and ffmpeg, nothing else. The worker
# The image of the container `feuerwerk-video` (#402): PHP and ffmpeg, nothing else. The worker
# itself is not baked in: compose.yml mounts the checkout, so a change to tools/video-worker.php or
# api/lib/Video*.php needs a restart, not a rebuild.
#
# The same Debian as the CI image (tools/ci/Dockerfile), so CI converts with the same ffmpeg.
# Built on stein2 like that one, for the same reasons (dead DNS in the default bridge network):
#
# DOCKER_BUILDKIT=0 docker build --network git_default -t game-maker-video:latest tools/video
# DOCKER_BUILDKIT=0 docker build --network git_default -t feuerwerk-video:latest tools/video
FROM debian:12-slim
RUN apt-get update && apt-get install -y --no-install-recommends php-cli php-mbstring ffmpeg \
tools/video/compose.yml
+7 -7
View File
@@ -4,18 +4,18 @@
#
# It works on the checkout itself (the folder nginx serves), as www-data like the PHP container, so
# the files it writes belong to the same user. It needs no network.
name: game-maker-video
name: feuerwerk-video
services:
game-maker-video:
container_name: game-maker-video
image: game-maker-video:latest
feuerwerk-video:
container_name: feuerwerk-video
image: feuerwerk-video:latest
restart: unless-stopped
network_mode: none
user: '33:33'
working_dir: /srv/game-maker
working_dir: /srv/feuerwerk
volumes:
- ../..:/srv/game-maker
command: ['php', 'tools/video-worker.php', '/srv/game-maker/data']
- ../..:/srv/feuerwerk
command: ['php', 'tools/video-worker.php', '/srv/feuerwerk/data']
# A 1080p conversion takes all four cores otherwise, and the web stack shares them.
cpus: 3