mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 10:59:59 +00:00
kevinveenbirkenbachandClaude Fable 5
40e553069d
Move files that share a delimiter-bounded name prefix within a folder (threshold 2) into a subfolder named after the prefix, dropping the prefix from the filename. Covers plugins/filter (docker, generate, has, merge, get/all), env handler subpackages, utils/roles/entity, utils/tests/swarm/write, role SQL/scripts/templates, keycloak/mailu task-includes, shared tasks/utils/load, and CI scripts. Update every import, query_file/script/include_tasks/src/lookup target, compose bind mount, and python -m path to the new locations. Extend the prefix-grouped-files lint to threshold 2 with dir-level .nocheck and file-head nocheck opt-outs, and skip groups whose shortest member's stem equals the shared prefix. Keep flat only where a loader forbids nesting: WordPress mu-plugins and the docs/requirements namespace. Ansible filter discovery is recursive, so nested filters stay Jinja-resolvable. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
27 lines
1.1 KiB
Bash
Executable File
27 lines
1.1 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Pre-push gate: fail unless the upstream main branch is fully merged into HEAD.
|
|
# Fetches the remote main tip and requires every commit on it to be reachable
|
|
# from the current tip, so a branch can never be pushed while it lags main.
|
|
#
|
|
# Env overrides: INFINITO_MAIN_REMOTE (default origin), INFINITO_MAIN_BRANCH
|
|
# (default main).
|
|
set -euo pipefail
|
|
|
|
remote="${INFINITO_MAIN_REMOTE:-origin}" # nocheck: git maintainer tooling knob, not a deployment env key
|
|
branch="${INFINITO_MAIN_BRANCH:-main}" # nocheck: git maintainer tooling knob, not a deployment env key
|
|
|
|
cd "$(git rev-parse --show-toplevel)"
|
|
|
|
echo "assert-main-merged: fetching ${remote}/${branch} ..." >&2
|
|
git fetch --quiet "$remote" "$branch"
|
|
|
|
if git merge-base --is-ancestor FETCH_HEAD HEAD; then
|
|
echo "✅ assert-main-merged: ${remote}/${branch} is fully merged into HEAD." >&2
|
|
exit 0
|
|
fi
|
|
|
|
behind="$(git rev-list --count HEAD..FETCH_HEAD)"
|
|
echo "❌ assert-main-merged: ${remote}/${branch} has ${behind} commit(s) not merged into HEAD." >&2
|
|
echo " Merge upstream main first, e.g.: git pull ${remote} ${branch}" >&2
|
|
exit 1
|