Skip to content

Commit 45336ce

Browse files
authored
Fix android lint (#15108)
- Robust against these kinds of failures "zsh: no matches found: extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/*.java"
1 parent 27df543 commit 45336ce

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

.github/workflows/lint.yml

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -143,19 +143,28 @@ jobs:
143143
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
144144
timeout: 90
145145
script: |
146-
FILES_NEEDS_FORMAT=$(/opt/google-java-format -n \
147-
extension/android/executorch_android/src/main/java/org/pytorch/executorch/*.java \
148-
extension/android/executorch_android/src/main/java/org/pytorch/executorch/extension/llm/*.java \
149-
extension/android/executorch_android/src/main/java/org/pytorch/executorch/annotations/*.java \
150-
extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/*.java \
151-
extension/benchmark/android/benchmark/app/src/main/java/org/pytorch/minibench/*.java \
152-
extension/benchmark/android/benchmark/app/src/androidTest/java/org/pytorch/minibench/*.java)
146+
FILES_NEEDS_FORMAT=$(find extension/android/executorch_android/src/main/java/org/pytorch/executorch \
147+
extension/android/executorch_android/src/main/java/org/pytorch/executorch/extension/llm \
148+
extension/android/executorch_android/src/main/java/org/pytorch/executorch/annotations \
149+
extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch \
150+
extension/benchmark/android/benchmark/app/src/main/java/org/pytorch/minibench \
151+
extension/benchmark/android/benchmark/app/src/androidTest/java/org/pytorch/minibench \
152+
-type f -name "*.java" 2>/dev/null | \
153+
xargs -r /opt/google-java-format -n)
154+
153155
if [ -n "$FILES_NEEDS_FORMAT" ]; then
154-
echo "Warning: The following files need formatting. Please use google-java-format."
155-
echo "Use a binary from https://github.com/google/google-java-format/releases/"
156-
echo "For example:"
157-
echo "wget https://github.com/google/google-java-format/releases/download/v1.23.0/google-java-format_linux-x86-64"
158-
echo "chmod +x google-java-format_linux-x86-64"
159-
echo "./google-java-format_linux-x86-64 -i $FILES_NEEDS_FORMAT"
156+
echo "Warning: The following files need formatting:"
157+
echo "$FILES_NEEDS_FORMAT"
158+
echo ""
159+
echo "Please use google-java-format from https://github.com/google/google-java-format/releases/"
160+
echo ""
161+
echo "To fix, run one of these commands:"
162+
echo " # Using xargs (recommended):"
163+
echo " find <paths> -type f -name '*.java' | xargs google-java-format -i"
164+
echo ""
165+
echo " # Or format specific files:"
166+
echo "$FILES_NEEDS_FORMAT" | while IFS= read -r file; do
167+
echo " google-java-format -i \"$file\""
168+
done
160169
exit 1
161170
fi

0 commit comments

Comments
 (0)