mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-10-05 19:28:25 +00:00
davotoula
42c96bf8fc
The [ExtraTranslation] failure that took main red in 1ce583ec92 was not documented anywhere. amethyst/src/main/res/CLAUDE.md and the find-missing-translations skill both mention the lint rule, but only inside one narrow case (converting a <string> to <plurals>). Neither stated the general rule: removing or renaming a key in the default values/strings.xml orphans every locale entry that still declares it. Nor would running lint have caught it in practice. The only pre-push gate is pre-push-spotless.sh, which runs spotlessApply and nothing else, and :amethyst:lintFdroidBenchmark takes ~19 minutes on a warm daemon, so it is not a per-commit check. Add both halves: - amethyst/src/main/res/CLAUDE.md gains a "Renaming or removing a string key" section stating the same-commit rule and why Crowdin is not a cleanup step CI waits for. The trap is that Crowdin is *partly* reliable — it cleaned 32 of 47 locales — so the tree looks correct in whichever files you open. Retitled the file (it is no longer plural-only) and marked the existing sections as the plural-specific ones they always were. - orphan_strings_check.py scans every locale's resource names against its tree's default values/, across both Crowdin-managed resource systems: the Android res trees and the commons Compose-Multiplatform catalog. 0.17s against the full repo. pre-push-orphan-strings.sh wraps it as a PreToolUse gate on git push / create_pull_request, reusing the shell-tokenizing push-detection from pre-push-spotless.sh so "push" inside a commit message is not mistaken for the subcommand. - find-missing-translations gains a Common Mistakes entry pointing at both. Verified: clean on the current tree; exit 2 listing the orphans when route_video is reintroduced in two locales and a retired key is seeded in the Compose catalog; gate fires on git push and create_pull_request, stays quiet on a commit whose message contains "push" and on non-Bash tools.
67 lines
2.6 KiB
Bash
Executable File
67 lines
2.6 KiB
Bash
Executable File
#!/bin/bash
|
|
# PreToolUse gate: make sure Kotlin is spotless-clean BEFORE it leaves the box.
|
|
#
|
|
# Fires on `git push` (Bash tool) and on the create_pull_request MCP tool. Runs
|
|
# `spotlessApply`; if that reformats any tracked .kt/.kts file, the push/PR is
|
|
# blocked (exit 2) so the agent commits the formatting fix first. This turns
|
|
# CI's `spotlessCheck` failure into an in-session block — no red PR, no round
|
|
# trip. `spotlessApply` runs the same formatters CI's `spotlessCheck` verifies,
|
|
# so a clean apply means a green check.
|
|
set -uo pipefail
|
|
|
|
hook_dir="$(cd "$(dirname "$0")" && pwd)"
|
|
cd "${CLAUDE_PROJECT_DIR:-.}" || exit 0
|
|
|
|
# --- Is this call a push/PR boundary? ---
|
|
payload="$(cat)"
|
|
|
|
# Cheap pure-bash pre-filter before paying for a python spawn. The gate below
|
|
# can only answer "yes" for a payload containing "push" (a git push command) or
|
|
# "pull_request" (the create_pull_request MCP tool), so anything else is a
|
|
# guaranteed no. This hook runs on EVERY Bash tool call, and the spawn it skips
|
|
# costs ~35ms each time.
|
|
case "$payload" in
|
|
*push*|*pull_request*) ;;
|
|
*) exit 0 ;;
|
|
esac
|
|
|
|
printf '%s' "$payload" | python3 "$hook_dir/lib/git_push_gate.py" || exit 0
|
|
|
|
# Nothing to format if no Kotlin is tracked/changed at all — cheap early out.
|
|
if ! git ls-files --error-unmatch '*.kt' '*.kts' >/dev/null 2>&1; then
|
|
exit 0
|
|
fi
|
|
|
|
# Snapshot Kotlin state (vs HEAD, so staged + unstaged both count) before/after
|
|
# formatting; any delta means the committed tree wasn't spotless.
|
|
before="$(git diff HEAD -- '*.kt' '*.kts' 2>/dev/null | sha1sum)"
|
|
|
|
log="$(mktemp /tmp/spotless-gate.XXXXXX.log)"
|
|
if ! ./gradlew spotlessApply >"$log" 2>&1; then
|
|
# Any failure blocks. The web sandbox pre-seeds the Gradle distribution (see
|
|
# .claude/hooks/session-start.sh) and Gradle resolves deps through the proxy,
|
|
# so spotlessApply no longer fails for infra reasons — a failure here is a
|
|
# real formatting/compile error, not a restricted-sandbox hiccup.
|
|
echo "BLOCKED: spotlessApply failed — fix the build/formatting error before pushing." >&2
|
|
echo "----- gradle output (tail) -----" >&2
|
|
tail -n 40 "$log" >&2
|
|
rm -f "$log"
|
|
exit 2
|
|
fi
|
|
rm -f "$log"
|
|
|
|
after="$(git diff HEAD -- '*.kt' '*.kts' 2>/dev/null | sha1sum)"
|
|
|
|
if [ "$before" != "$after" ]; then
|
|
echo "BLOCKED: spotlessApply reformatted Kotlin files that were about to be pushed." >&2
|
|
echo "The changes below are now in your working tree. Commit them, then retry:" >&2
|
|
echo >&2
|
|
git diff --name-only HEAD -- '*.kt' '*.kts' >&2
|
|
echo >&2
|
|
echo " git add -A && git commit -m 'style: apply spotless' && <retry the push>" >&2
|
|
echo "(CI runs 'spotlessCheck'; pushing now would fail the lint job.)" >&2
|
|
exit 2
|
|
fi
|
|
|
|
exit 0
|