mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 19:01:54 +00:00
kevinveenbirkenbachandClaude Opus 4.7
9a578952c3
Replace 8 bash env modules with a single Python generator
(cli.meta.env) that materialises env/static.env + runtime context
into a gitignored .env. Each variable lives in its own handler
under utils/env/handlers/; defaults carry inline one-line `# ...`
comments.
Rename to the INFINITO_* schema:
- workflow inputs: APPS, SERVICES_DISABLED, CMD, DEBUG, WHITELIST,
BUNDLES, FULL_CYCLE, VARIANT, RUN_FLAGS, LIMIT_HOST, PARALLEL
- inventory: INVENTORY_DIR / INVENTORY_FILE / HOST_VARS_FILE,
PW_FILE -> INVENTORY_PASSWORD_FILE
- venv: VENV_BASE / VENV_FALLBACK / VENV_NAME
- new SPOT defaults: COMPILE_SILENCE, CONTAINER_NO_CA,
WAIT_HEALTH_TIMEOUT_S, PACKAGE_CACHE_FRONTEND_INIT_IMAGE,
promoted IMAGE_TAG from GHA-only to general passthrough
compose.yml hardening:
- inline \${VAR:-default} removed; strict \${VAR:?...} everywhere
- new integration lint blocks regressions
Tooling:
- scripts/install/all.sh owns the stamp-file install logic
(Makefile target delegates)
- scripts/meta/env/load.sh is the single shell entry point;
8 bash modules deleted
- new shell lint: no INFINITO_* defaults outside env/static.env
Tests:
- 93 new unit tests for utils/env/{builder,parser,runtime,writer}
- restructure tests/lint into repository/ (file-content rules) vs
filesystem/{shell,python,env}/ (filesystem-shape rules)
- drift + smoke integration tests against the generator
Docs:
- variables.md is now a pointer; per-variable docs live next to
the key in env/static.env / env/ci.env
- compose.yml.md drops the Default column
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
71 lines
3.0 KiB
Bash
Executable File
71 lines
3.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Chooses where to execute scripts/tests/code/run.sh based on
|
|
# INFINITO_TEST_RUNNER:
|
|
# docker (default) -- inside the already-running infinito compose
|
|
# container (requires `make up`).
|
|
# host -- directly against the host shell/Python.
|
|
set -euo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
REPO_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)"
|
|
RUN_SCRIPT="${SCRIPT_DIR}/run.sh"
|
|
|
|
# Pull project-wide defaults (INFINITO_SRC_DIR, INFINITO_TEST_PATTERN, ...)
|
|
# from the generated `.env` (single source of truth) before validating
|
|
# anything else, so the :?-checks below see the static defaults.
|
|
cd "${REPO_ROOT}"
|
|
# shellcheck source=scripts/meta/env/load.sh
|
|
source scripts/meta/env/load.sh
|
|
|
|
: "${INFINITO_TEST_PATTERN:?INFINITO_TEST_PATTERN must be set}"
|
|
: "${INFINITO_TEST_RUNNER:?INFINITO_TEST_RUNNER must be set}"
|
|
: "${INFINITO_TEST_TYPE:?INFINITO_TEST_TYPE must be set}"
|
|
|
|
RUN_SCRIPT_IN_CONTAINER="${INFINITO_SRC_DIR}/scripts/tests/code/run.sh"
|
|
|
|
case "${INFINITO_TEST_RUNNER}" in
|
|
docker)
|
|
# INFINITO_DISTRO is sourced (with a `debian` default) from
|
|
# scripts/meta/env/load.sh above, so no explicit check here.
|
|
echo "============================================================"
|
|
echo ">>> Running ${INFINITO_TEST_TYPE^^} tests in ${INFINITO_DISTRO} container (compose stack)"
|
|
echo "============================================================"
|
|
|
|
# Auto-bring-up: if the `infinito` container is not running, kick off
|
|
# `make up` first so test-* doesn't fail with "service not running".
|
|
if ! docker compose --env-file env/ci.env --env-file .env --profile ci \
|
|
ps -q infinito 2>/dev/null | grep -q .; then
|
|
echo ">>> 'infinito' container not running; starting the stack via 'make up'..."
|
|
"${MAKE:-make}" up
|
|
fi
|
|
|
|
# `--env-file env/ci.env --env-file .env` pulls the network defaults
|
|
# (INFINITO_DNS_IP, INFINITO_IP4, INFINITO_DOMAIN, ...) from ci.env
|
|
# and the generated keys (INFINITO_CONTAINER, INFINITO_SUBNET, ...)
|
|
# from `.env`. Compose otherwise auto-loads only `.env`, which would
|
|
# leave the ci.env keys unset when this wrapper is the entry point.
|
|
INFINITO_DISTRO="${INFINITO_DISTRO}" \
|
|
docker compose --env-file env/ci.env --env-file .env --profile ci exec -T \
|
|
-e ACT="${ACT:-}" \
|
|
-e GITHUB_ACTIONS="${GITHUB_ACTIONS:-}" \
|
|
-e GITHUB_REPOSITORY="${GITHUB_REPOSITORY:-}" \
|
|
-e GITHUB_REPOSITORY_OWNER="${GITHUB_REPOSITORY_OWNER:-}" \
|
|
-e GITHUB_SHA="${GITHUB_SHA:-}" \
|
|
-e INFINITO_TEST_PATTERN="${INFINITO_TEST_PATTERN}" \
|
|
-e INFINITO_TEST_TYPE="${INFINITO_TEST_TYPE}" \
|
|
--workdir "${INFINITO_SRC_DIR}" \
|
|
infinito \
|
|
bash --login "${RUN_SCRIPT_IN_CONTAINER}"
|
|
;;
|
|
host)
|
|
echo "============================================================"
|
|
echo ">>> Running ${INFINITO_TEST_TYPE^^} tests on host"
|
|
echo "============================================================"
|
|
exec bash --login "${RUN_SCRIPT}"
|
|
;;
|
|
*)
|
|
echo "scripts/tests/code/wrapper.sh: unknown INFINITO_TEST_RUNNER='${INFINITO_TEST_RUNNER}' (expected: docker|host)" >&2 # nocheck: self-path-reference
|
|
exit 2
|
|
;;
|
|
esac
|