Merge pull request #337 from graphql-java-kickstart/verify-google-code-format

chore(code-style): verify google code style

Author: oliemansm

.github/workflows/pull-request.yml

@@ -1,14 +1,43 @@
 name: "Pull request"
 on:
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [ opened, synchronize, reopened ]
+
 jobs:
   validation:
     name: Gradle Wrapper Validation
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
+
+  verify-google-java-format:
+    name: Google Java Format Verification
+    runs-on: ubuntu-latest
+    needs: validation
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: 15
+      - name: Cache Gradle
+        uses: actions/cache@v2
+        env:
+          java-version: 15
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+      - name: Gradle Check
+        run: ./gradlew --info build -x test
+
   test:
     name: Test run
     strategy:
@@ -35,18 +64,18 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
           key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ env.java-version }}-gradle-
+          restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
       - name: Make gradlew executable (non-Windows only)
         if: matrix.os != 'windows-latest'
         run: chmod +x ./gradlew
       - name: Gradle Check (non-Windows)
         if: matrix.os != 'windows-latest'
-        run: ./gradlew --info check
+        run: ./gradlew --info check -x verifyGoogleJavaFormat
       - name: Gradle Check (Windows)
         if: matrix.os == 'windows-latest'
         shell: cmd
-        run: gradlew --info check
+        run: gradlew --info check -x verifyGoogleJavaFormat
+
   build:
     name: Sonar analysis
     needs: validation
@@ -83,4 +112,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew build jacocoTestReport sonarqube --info
+        run: ./gradlew build jacocoTestReport sonarqube --info -x verifyGoogleJavaFormat

.github/workflows/release.yml

@@ -8,6 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
+
   test:
     name: Test run
     needs: validation
@@ -34,7 +35,8 @@ jobs:
       - name: Make gradlew executable
         run: chmod +x ./gradlew
       - name: Gradle Check
-        run: ./gradlew --info check
+        run: ./gradlew --info check -x verifyGoogleJavaFormat
+
   build:
     name: Publish release
     needs: test

.github/workflows/snapshot.yml

@@ -11,6 +11,34 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
+
+  verify-google-java-format:
+    name: Google Java Format Verification
+    runs-on: ubuntu-latest
+    needs: validation
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: 15
+      - name: Cache Gradle
+        uses: actions/cache@v2
+        env:
+          java-version: 15
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+      - name: Gradle Check
+        run: ./gradlew --info build -x test
+
   test:
     name: Test run
     needs: validation
@@ -37,7 +65,8 @@ jobs:
       - name: Make gradlew executable
         run: chmod +x ./gradlew
       - name: Gradle Check
-        run: ./gradlew --info check
+        run: ./gradlew --info check -x verifyGoogleJavaFormat
+
   build:
     name: Publish snapshot
     needs: test
@@ -68,7 +97,8 @@ jobs:
         env:
           OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
           OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
-        run: ./gradlew clean build publish -x test
+        run: ./gradlew clean build publish -x test verifyGoogleJavaFormat
+
   sonar:
     name: Sonar analysis
     needs: validation
@@ -98,4 +128,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew build jacocoTestReport sonarqube --info
+        if: env.SONAR_TOKEN != null
+        run: ./gradlew build jacocoTestReport sonarqube --info -x verifyGoogleJavaFormat

.gitignore

@@ -3,7 +3,8 @@ build/
 *.iml
 *.ipr
 *.iws
-**/.idea/
+.idea/*
+!.idea/codeStyles/
 target/
 /out/
 .classpath