Add Makefile shims for cibuild and precommit (closes #34)

script/cibuild and script/precommit both existed and were already the
documented CI and pre-commit entrypoints, but neither had a Makefile
target, so the standing rule to drive the repo through make targets
rather than the underlying tool could not be followed for either.

It matters most for the build. A bare `docker build .` fails closed on
the CHECK_EPOCH guard by design, so script/cibuild is one of only three
supported ways to build an image here, and it was the only one of the
three without a target while `make docker` had one.

The two targets are thin shims in the same style as every other target
and change nothing about what the scripts do. .PHONY was already
complete for the targets that existed and now lists both new ones.

README.md's Entrypoints section gains the script-to-target mapping so
the two documents agree, including the two names that do not match:
script/install-precommit is `make hooks`, and script/precommit is
`make precommit`. It also warns that `make cibuild` runs two container
builds and costs minutes, so nobody types it expecting the runtime the
other make targets have.

Dockerfile.lint

@@ -21,11 +21,9 @@
 # so calling it from inside would recurse into a docker build with no
 # daemon.
 #
-# This repo's lint is a Hugo build that fails on any build error and on
-# any Hugo warning. --printPathWarnings makes Hugo warn when two pages
-# write the same output path, and --panicOnWarning turns that warning,
-# and every other one, into a failed build. Only the lint is this strict:
-# script/test and the deploy build stay plain `hugo --minify`.
+# This repo's lint is a clean Hugo build that surfaces broken internal
+# links and template path problems: `hugo` fails on build errors and
+# --printPathWarnings reports render-target collisions.
 
 # alpine 3.21, 2026-02-28
 FROM alpine@sha256:c3f8e73fdb79deaebaa2037150150191b9dcbfba68b4a46d70103204c53f4709
@@ -60,5 +58,4 @@ COPY . .
 # references.
 ARG CHECK_EPOCH
 RUN [ -n "$CHECK_EPOCH" ] || exit 1
-RUN echo "lint epoch: ${CHECK_EPOCH}" && \
-    hugo --minify --printPathWarnings --panicOnWarning
+RUN echo "lint epoch: ${CHECK_EPOCH}" && hugo --minify --printPathWarnings

README.md

@@ -66,10 +66,9 @@ provide:
   git pre-commit hook
 - `script/test` — the correctness check: a clean `hugo --minify` production
   build
-- `script/lint` — a Hugo build that fails on any Hugo warning, including two
-  pages that write the same output path, run inside Docker: it builds
-  `Dockerfile.lint`, where the lint is a build step, so a successful build is a
-  clean lint
+- `script/lint` — a clean build that surfaces broken links and path collisions,
+  run inside Docker: it builds `Dockerfile.lint`, where the lint is a build
+  step, so a successful build is a clean lint
 - `script/fmt` — format every markdown and CSS file in the repo with prettier;
   the exclusions live in `.prettierignore` with the reason for each
 - `script/fmt-check` — check that formatting (read-only)
@@ -79,21 +78,18 @@ provide:
 - `script/cibuild` — the CI build: `script/lint` first, for fail-fast feedback,
   then the main image, which runs the non-lint checks
 - `script/install-precommit` — install the git pre-commit hook that runs
-  `script/precommit`
+  `script/check`
 
 Each of those has a Makefile shim of the same name — `make bootstrap`,
 `make setup`, `make test`, `make lint`, `make fmt`, `make fmt-check`,
 `make check`, `make docker`, `make cibuild` — with one exception:
 `script/install-precommit` is `make hooks`. `script/precommit`, which is what
 the installed hook runs, is `make precommit`. Prefer the make targets; the
-`Makefile` lists the operations you are expected to run.
+`Makefile` is the authoritative list of what this repo can do.
 
-`make cibuild` is the slowest target: it is the only one that runs two container
-builds, the lint image first and then the main image. The two share the
-`script/bootstrap` layer byte-for-byte, so the pinned-Hugo compile described
-above is paid once per machine rather than twice, and once that layer is cached
-a full `make cibuild` takes seconds. That is the cost of the CI build, not a
-sign of a problem.
+`make cibuild` is the slow one. It runs two container builds rather than
+anything on the host, so budget minutes, not the seconds a `make`-shaped command
+usually implies. That is the cost of the CI build, not a sign of a problem.
 
 Every lint run for this repo happens inside a container, and only the lint does.
 `script/lint` has no host path and no "already inside a container?" branch, so

TODO.md

@@ -20,8 +20,8 @@ wrangler CLI install, an exact version), and the Hugo that builds the published
 site is a deliberate pinned version rather than whatever the base image's
 package repo serves. The site now ships a Cloudflare Pages `_headers` file, so
 its response security headers are declared in the repo instead of being whatever
-the edge defaults to, and confirmed live in production on both hostnames. The
-lint now runs inside a container and nowhere else: `script/lint` is a build of
+the edge defaults to — unverified in production until the next deploy. The lint
+now runs inside a container and nowhere else: `script/lint` is a build of
 `Dockerfile.lint`, with no host path to fall back to. Formatting is not a lint
 and stays on the host. Every entrypoint the README documents now has a
 `Makefile` target, so the org-wide "use make targets, never the underlying tool"
@@ -34,13 +34,6 @@ leaning on `.gitignore` (https://git.eeqj.de/sneak/lora.vegas/issues/33).
 
 # Completed Steps
 
-- 2026-10-21: made `script/lint` fail when two pages write the same output path
-  (https://git.eeqj.de/sneak/lora.vegas/issues/25). `Dockerfile.lint` now runs
-  `hugo --minify --printPathWarnings --panicOnWarning`. `--printPathWarnings`
-  makes Hugo warn about the collision, and `--panicOnWarning` turns that warning
-  and every other Hugo warning into a failed lint; until now the warning was
-  printed and the lint still exited 0. `script/test` and the deploy build stay
-  plain `hugo --minify`
 - 2026-08-10: added the `cibuild` and `precommit` targets to the `Makefile`
   (https://git.eeqj.de/sneak/lora.vegas/issues/34). Both scripts already
   existed, were already documented, and are the two entrypoints a contributor is
@@ -57,22 +50,16 @@ leaning on `.gitignore` (https://git.eeqj.de/sneak/lora.vegas/issues/33).
   now lists both. `README.md`'s Entrypoints section gained the script-to-target
   mapping, including the two names that do not match —
   `script/install-precommit` is `make hooks`, and `script/precommit` is
-  `make precommit` — plus a note that `make cibuild` is the slowest target
-  because it is the only one that runs two container builds, while still taking
-  seconds once the shared `script/bootstrap` layer is cached. The section's
-  pre-existing `script/install-precommit` bullet, which claimed the installed
-  hook runs `script/check`, now says `script/precommit`, which is what the
-  script actually writes into `.git/hooks/pre-commit`. The stale Future Step
-  asking for post-deploy confirmation of `static/_headers` is dropped here: it
-  was confirmed live on both hostnames
-  (https://git.eeqj.de/sneak/lora.vegas/issues/14). Verified that `make cibuild`
-  earns its green rather than replaying a warm cache: one invocation ran both
-  builds for real in sequence, each with its own distinct `CHECK_EPOCH`, with
-  `RUN script/bootstrap` `CACHED` above and no check layer cached below it — the
-  `Dockerfile.lint` build echoed its epoch and printed hugo's own build table,
-  then the main image build echoed a different epoch, ran `script/test` for the
-  production build and `script/fmt-check` for the formatting check.
-  `make precommit` passes on a clean tree, and `make check` passes
+  `make precommit` — plus a warning that `make cibuild` costs minutes because it
+  is two container builds, so nobody types it expecting a `make`-shaped runtime.
+  Verified that `make cibuild` earns its green rather than replaying a warm
+  cache: one invocation ran both builds for real in sequence, each with its own
+  distinct `CHECK_EPOCH`, with `RUN script/bootstrap` `CACHED` above and no
+  check layer cached below it — the `Dockerfile.lint` build echoed its epoch and
+  printed hugo's own build table, then the main image build echoed a different
+  epoch, ran `script/test` for the production build and `script/fmt-check` for
+  the formatting check. `make precommit` passes on a clean tree, and
+  `make check` passes
 - 2026-08-10: moved the lint into Docker
   (https://git.eeqj.de/sneak/lora.vegas/issues/38). A new root `Dockerfile.lint`
   runs `hugo --minify --printPathWarnings` as a build step, so a successful
@@ -335,6 +322,10 @@ outside this repo, so nothing there may be picked up as the Next Step.
 
 ## Blocked
 
+- Decide whether `script/lint` should fail on render-target collisions rather
+  than only print them; `--printPathWarnings` exits 0 today, so the signal is
+  reported and not enforced. Owner call, since it changes what the gate rejects
+  (https://git.eeqj.de/sneak/lora.vegas/issues/25)
 - Move the artifact actions in `.gitea/workflows/deploy.yml` to v4 once this
   Gitea Actions instance serves the v4 artifact protocol; they are pinned on the
   deprecated v3 line because v4 fails here
@@ -345,6 +336,17 @@ outside this repo, so nothing there may be picked up as the Next Step.
 - Delete the stale remote branches `feat/initial-site` and `security-audit`;
   only the owner can remove them
   (https://git.eeqj.de/sneak/lora.vegas/issues/15)
+- After the next deploy, confirm the `_headers` file actually took effect, on
+  both `https://lora.vegas/` and `https://www.lora.vegas/`: `curl -sSI` against
+  each must show `strict-transport-security` or `content-security-policy`.
+  Cloudflare Pages silently ignores a malformed `_headers`, and checking
+  `x-content-type-options` would pass either way because the edge sends it
+  regardless. `www` has to be checked too and not just the apex: dropping
+  `includeSubDomains` rests on `www.lora.vegas` being served by this same Pages
+  project, which was established behaviourally from identical response bodies
+  rather than from the Cloudflare dashboard. If `www` turns out not to be
+  covered, the `includeSubDomains` decision has to be revisited
+  (https://git.eeqj.de/sneak/lora.vegas/issues/14)
 - Decide the HSTS `includeSubDomains` and `preload` posture for `lora.vegas`.
   Both are owner calls: neither can be walked back inside the max-age window,
   and `includeSubDomains` binds hostnames this repo does not control

script/check

@@ -2,7 +2,7 @@
 # script/check: run all checks. Our own extension to
 # scripts-to-rule-them-all. Must not modify any tracked files. Runs the
 # canonical order: the clean production build, then the lint build that
-# fails on any Hugo warning, then the read-only formatting check.
+# reports path warnings, then the read-only formatting check.
 #
 # The lint - and only the lint - runs inside Docker: it is a build of
 # Dockerfile.lint, so this script needs a working docker daemon and has

script/lint

@@ -1,13 +1,12 @@
 #!/bin/sh
 # script/lint: run the lint. This Hugo site has no dedicated linter, so
-# the lint is a Hugo build that fails on any build error and on any Hugo
-# warning, including two pages that write the same output path. Where
-# it runs is not negotiable. Every lint run happens inside a Docker
-# container, so this script does nothing except build Dockerfile.lint.
-# The lint is a build step there, so a successful build is a clean lint.
-# There is deliberately no host fallback and no "already inside a
-# container?" branch: either would be a host lint path wearing a
-# disguise.
+# the lint gate is a clean build that surfaces broken internal links and
+# template path problems -- but where it runs is not negotiable: every
+# lint run happens inside a Docker container, so this script does
+# nothing except build Dockerfile.lint. The lint is a build step there,
+# so a successful build is a clean lint. There is deliberately no host
+# fallback and no "already inside a container?" branch: either would be
+# a host lint path wearing a disguise.
 #
 # No --target: Dockerfile.lint has exactly one stage, so the whole-file
 # build IS the lint. See that file for why a second, sibling stage would