Skip to content

Commit 6b68bc1

Browse files
committed
Fix android lint
1 parent c539dfc commit 6b68bc1

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

.github/workflows/lint.yml

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -143,19 +143,24 @@ 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)
153-
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"
160-
exit 1
146+
FILES_TO_CHECK=$(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" -o -name "*.kt" \) 2>/dev/null)
153+
154+
# Only run formatter if files were found
155+
if [ -n "$FILES_TO_CHECK" ]; then
156+
FILES_NEEDS_FORMAT=$(/opt/google-java-format -n $FILES_TO_CHECK)
157+
if [ -n "$FILES_NEEDS_FORMAT" ]; then
158+
echo "Warning: The following files need formatting. Please use google-java-format."
159+
echo "Use a binary from https://github.com/google/google-java-format/releases/"
160+
echo "For example:"
161+
echo "wget https://github.com/google/google-java-format/releases/download/v1.23.0/google-java-format_linux-x86-64"
162+
echo "chmod +x google-java-format_linux-x86-64"
163+
echo "./google-java-format_linux-x86-64 -i $FILES_NEEDS_FORMAT"
164+
exit 1
165+
fi
161166
fi

0 commit comments

Comments
 (0)