@@ -14,20 +14,34 @@ FE ?= fe
1414FE_REPO ?= argotorg/fe
1515FE_SRC ?= $(error FE_SRC required — path to local clone of $(FE_REPO ) )
1616BUILD := _build
17+ VERSION_RE := ^([0-9]+\.){2}[0-9]+(-[0-9A-Za-z]+([.-][0-9A-Za-z]+)*)?(\+[0-9A-Za-z]+([.-][0-9A-Za-z]+)*)?$$
18+
19+ # Keep command-line values literal when make exports them to recipe shells.
20+ override TAG := $(value TAG)
21+ override T := $(value T)
22+ override VERSION := $(value VERSION)
23+ override OUTDIR := $(value OUTDIR)
24+ export TAG T VERSION OUTDIR
1725
1826SHELL := /bin/bash
1927.SHELLFLAGS := -euo pipefail -c
2028
21- .PHONY : build build-all build-stable deploy list clean
29+ .PHONY : build build-all build-stable deploy list clean test
30+
31+ test :
32+ @python3 -m unittest discover -s tests
2233
2334build :
2435ifndef TAG
2536 $(error TAG required. Usage: make build TAG=v26.0.0 FE_SRC=../fe FE=path/to/fe)
2637endif
27- @$(MAKE) --no-print-directory _build-tag T=$(TAG)
38+ @tag="$${TAG}"; \
39+ [[ "$$tag" == v* && "$${tag# v}" =~ $(VERSION_RE) ]] || { echo "Invalid release tag: $$tag" >&2; exit 1; }; \
40+ T="$$tag" $(MAKE) --no-print-directory _build-tag
2841
2942_build-tag :
30- @tag=" $( T) " ; \
43+ @tag=" $$ {T}" ; \
44+ [[ " $$ tag" == v* && " $$ {tag#v}" =~ $( VERSION_RE) ]] || { echo " Invalid release tag: $$ tag" >&2 ; exit 1; }; \
3145 version=" $$ {tag#v}" ; \
3246 if [ -f " $$ {version}/docs.json.gz" ] && [ -z " $( FORCE) " ]; then \
3347 echo " SKIP $$ tag" ; \
@@ -55,16 +69,17 @@ endif
5569ifndef OUTDIR
5670 $(error OUTDIR required — directory containing docs.json, fe-web.js, etc.)
5771endif
58- @echo "Deploying Fe $(VERSION) docs..."
72+ @[[ "$$VERSION" =~ $(VERSION_RE) ]] || { echo "Invalid release version: $$VERSION" >&2; exit 1; }
73+ @echo "Deploying Fe $$VERSION docs..."
5974 @for f in fe-web.js fe-highlight.css styles.css; do \
60- [ -f "$( OUTDIR) /$$f" ] && cp "$( OUTDIR) /$$f" "./$$f" && echo " Updated $$f" || true; \
75+ [ -f "$$ OUTDIR/$$f" ] && cp "$$ OUTDIR/$$f" "./$$f" && echo " Updated $$f" || true; \
6176 done
62- @mkdir -p "$( VERSION) "
63- @gzip -c "$( OUTDIR) /docs.json" > "$( VERSION) /docs.json.gz"
64- @sed ' s|{{VERSION}}|$( VERSION)|g' _template/index.html > "$( VERSION) /index.html"
65- @echo " Created $( VERSION) / ($$(du -h "$( VERSION) /docs.json.gz" | cut -f1))"
77+ @mkdir -p "$$ VERSION"
78+ @gzip -c "$$ OUTDIR/docs.json" > "$$ VERSION/docs.json.gz"
79+ @sed " s|{{VERSION}}|$$ VERSION|g" _template/index.html > "$$ VERSION/index.html"
80+ @echo " Created $$ VERSION/ ($$(du -h "$$ VERSION/docs.json.gz" | cut -f1))"
6681 @[ -f versions.json ] || echo '{"latest":"","versions":[]}' > versions.json
67- @jq --arg v "$( VERSION) " \
82+ @jq --arg v "$$ VERSION" \
6883 'if (.versions | index($$v)) then . else .versions += [$$v] end | .latest = ([.versions[] | select(test("^[0-9]+\\.[0-9]+\\.[0-9]+$$"))] | sort_by(split(".") | map(tonumber)) | last // .versions[0])' \
6984 versions.json > versions.json.tmp && mv versions.json.tmp versions.json
7085 @echo " versions.json: latest=$$(jq -r '.latest' versions.json), $$(jq '.versions | length' versions.json) versions"
@@ -74,7 +89,7 @@ build-stable:
7489 tags=$$(gh release list --repo $(FE_REPO ) --limit 100 --json tagName --jq '.[].tagName | select(startswith("v2" ) and test(" ^v[0-9]+\\ .[0-9]+\\ .[0-9]+$$ " ))' ); \
7590 failed=0; \
7691 for tag in $$ tags; do \
77- $ (MAKE ) --no-print-directory _build-tag T= $$ tag FORCE=" $( FORCE) " || failed=$$((failed + 1 ) ); \
92+ T= " $$ tag " $ (MAKE ) --no-print-directory _build-tag FORCE=" $( FORCE) " || failed=$$((failed + 1 ) ); \
7893 done ; \
7994 echo " " ; \
8095 if [ $$ failed -gt 0 ]; then \
@@ -88,7 +103,7 @@ build-all:
88103 tags=$$(gh release list --repo $(FE_REPO ) --limit 100 --json tagName --jq '.[].tagName | select(startswith("v2" ) )' ); \
89104 failed=0; \
90105 for tag in $$ tags; do \
91- $ (MAKE ) --no-print-directory _build-tag T= $$ tag FORCE=" $( FORCE) " || failed=$$((failed + 1 ) ); \
106+ T= " $$ tag " $ (MAKE ) --no-print-directory _build-tag FORCE=" $( FORCE) " || failed=$$((failed + 1 ) ); \
92107 done ; \
93108 echo " " ; \
94109 if [ $$ failed -gt 0 ]; then \
0 commit comments