Skip to content

chore(claude): route the commit and push hooks through gradle-queue #7750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamesarich merged 1 commit into from
Oct 23, 2026
Merged

chore(claude): route the commit and push hooks through gradle-queue #7750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions .claude/hooks/pre-bash-guard.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ export_android_home() {
done
}

# Same probe as the gradle-runner agent: the machine-local queue wrapper when
# installed, so hook builds don't race other sessions' builds.
gradle() {
local gq="$HOME/.claude/bin/gradle-queue"
if [ -x "$gq" ]; then "$gq" -- "$@"; else ./gradlew "$@"; fi
}

# --- 2. Destructive-op confirmation (cheap checks first) --------------------
if printf '%s' "$cmd" | grep -q 'git push' \
&& printf '%s' "$cmd" | grep -Eq -- '(--force([^-]|$)|[[:space:]]-f([[:space:]]|$))'; then
Expand All @@ -68,8 +75,13 @@ if printf '%s' "$cmd" | grep -q 'git push'; then
repo_root=$(git -C "$cwd" rev-parse --show-toplevel 2>/dev/null) || exit 0
is_this_repo "$repo_root" || exit 0
export_android_home
out=$( (cd "$repo_root" && ./gradlew detekt --console=plain -q) 2>&1 )
if [ $? -ne 0 ]; then
out=$( (cd "$repo_root" && gradle detekt --console=plain -q) 2>&1 )
rc=$?
if [ "$rc" -eq 75 ]; then
printf '%s\n' "detekt never started (gradle-queue wait timed out) - allowing the push; run detekt before relying on CI." >&2
exit 0
fi
if [ "$rc" -ne 0 ]; then
{
printf '%s\n' "detekt failed — blocking the push (it's a blocking CI gate). Last lines:"
printf '%s\n' "$out" | tail -n 30
Expand Down Expand Up @@ -106,7 +118,7 @@ staged=$(git -C "$repo_root" diff --cached --name-only --diff-filter=ACMR -- '*.
[ -z "$staged" ] && exit 0

export_android_home
out=$( (cd "$repo_root" && ./gradlew spotlessApply --console=plain -q) 2>&1 )
out=$( (cd "$repo_root" && gradle spotlessApply --console=plain -q) 2>&1 )
if [ $? -ne 0 ]; then
{
printf '%s\n' "spotless-precommit: spotlessApply failed — allowing the commit anyway (fail-open)."
Expand Down