Merge pull request #6268 from robolectric/piper_361611243

Execute google-java-format-diff.py directly on CI machines
robolectric · Mar 10, 2021 · 4f1290c · 4f1290c
2 parents 6dc3300 + b1ffa56
commit 4f1290c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -43,13 +43,14 @@ jobs:
           command: |
             curl -L -o $HOME/google-java-format.jar https://github.com/google/google-java-format/releases/download/google-java-format-1.9/google-java-format-1.9-all-deps.jar
             curl -L -o $HOME/google-java-format-diff.py https://raw.githubusercontent.com/google/google-java-format/google-java-format-1.9/scripts/google-java-format-diff.py
+            chmod +x $HOME/google-java-format-diff.py
       - run:
           name: Check Java formatting
           command: |
-            diff=$(git diff -U0 $(git merge-base HEAD origin/master) | python $HOME/google-java-format-diff.py --google-java-format-jar=$HOME/google-java-format.jar -p1)
+            diff=$(git diff -U0 $(git merge-base HEAD origin/master) | $HOME/google-java-format-diff.py --google-java-format-jar=$HOME/google-java-format.jar -p1)
             if [[ $diff ]]; then
               echo "Please run google-java-format on the changes in this pull request"
-              git diff -U0 $(git merge-base HEAD origin/master) | python $HOME/google-java-format-diff.py --google-java-format-jar=$HOME/google-java-format.jar -p1
+              git diff -U0 $(git merge-base HEAD origin/master) | $HOME/google-java-format-diff.py --google-java-format-jar=$HOME/google-java-format.jar -p1
               exit 1
             fi
   build:

diff --git a/.github/workflows/check_java_formatting.yml b/.github/workflows/check_java_formatting.yml
@@ -25,12 +25,12 @@ jobs:
         run: |
           curl -L -o $HOME/google-java-format.jar https://github.com/google/google-java-format/releases/download/google-java-format-1.9/google-java-format-1.9-all-deps.jar
           curl -L -o $HOME/google-java-format-diff.py https://raw.githubusercontent.com/google/google-java-format/google-java-format-1.9/scripts/google-java-format-diff.py
-
+          chmod +x $HOME/google-java-format-diff.py
       - name: Check Java formatting
         run: |
-          diff=$(git diff -U0 $(git merge-base HEAD origin/master) | python $HOME/google-java-format-diff.py --google-java-format-jar=$HOME/google-java-format.jar -p1)
+          diff=$(git diff -U0 $(git merge-base HEAD origin/master) | $HOME/google-java-format-diff.py --google-java-format-jar=$HOME/google-java-format.jar -p1)
           if [[ $diff ]]; then
             echo "Please run google-java-format on the changes in this pull request"
-            git diff -U0 $(git merge-base HEAD origin/master) | python $HOME/google-java-format-diff.py --google-java-format-jar=$HOME/google-java-format.jar -p1
+            git diff -U0 $(git merge-base HEAD origin/master) | $HOME/google-java-format-diff.py --google-java-format-jar=$HOME/google-java-format.jar -p1
             exit 1
-          fi
+          fi
diff --git a/...rone/src/test/java/org/robolectric/errorprone/bugpatterns/DeprecatedMethodsCheckTest.java b/...rone/src/test/java/org/robolectric/errorprone/bugpatterns/DeprecatedMethodsCheckTest.java
@@ -11,7 +11,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/** @author christianw@google.com (Christian Williams) */
+/** Tests for {@link DeprecatedMethodsCheck} */
 @RunWith(JUnit4.class)
 @SuppressWarnings("LineLength")
 public class DeprecatedMethodsCheckTest {
@@ -211,10 +211,8 @@ public void useFrameworkMethodWhenAppropriateAfterApplicationSubstitution() thro
         .doTest();
   }
 
-  @BugPattern(
-      name = "DeprecatedMethods",
-      summary = "",
-      severity = WARNING)
+  /** Test overrides for {@link DeprecatedMethodsCheck} */
+  @BugPattern(name = "DeprecatedMethods", summary = "", severity = WARNING)
   public static class DeprecatedMethodsCheckForTest extends DeprecatedMethodsCheck {
     @Override
     String shadowName(String className) {