Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit 3385712

Browse files
authored
Merge pull request #599 from graphql-java-kickstart/verify-google-code-format
Verify google code format
2 parents 73f02a8 + f20285c commit 3385712

File tree

282 files changed

+3324
-2590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

282 files changed

+3324
-2590
lines changed

.github/workflows/ci.yml

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,34 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v2
1414
- uses: gradle/wrapper-validation-action@v1
15+
16+
verify-google-java-format:
17+
name: Google Java Format Verification
18+
runs-on: ubuntu-latest
19+
needs: validation
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v2
23+
- name: Setup Java
24+
uses: actions/setup-java@v2
25+
with:
26+
distribution: 'zulu'
27+
java-version: 15
28+
- name: Cache Gradle
29+
uses: actions/cache@v2
30+
env:
31+
java-version: 15
32+
with:
33+
path: |
34+
~/.gradle/caches
35+
~/.gradle/wrapper
36+
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
37+
restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
38+
- name: Make gradlew executable
39+
run: chmod +x ./gradlew
40+
- name: Gradle Check
41+
run: ./gradlew --info build -x test
42+
1543
test:
1644
name: Test run
1745
needs: validation
@@ -38,7 +66,8 @@ jobs:
3866
- name: Make gradlew executable
3967
run: chmod +x ./gradlew
4068
- name: Gradle Check
41-
run: ./gradlew --info check
69+
run: ./gradlew --info check -x verifyGoogleJavaFormat
70+
4271
build:
4372
name: Publish snapshot
4473
needs: test
@@ -69,7 +98,8 @@ jobs:
6998
env:
7099
OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
71100
OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
72-
run: ./gradlew clean build publish -x test
101+
run: ./gradlew clean build publish -x test -x verifyGoogleJavaFormat
102+
73103
sonar:
74104
name: Sonar analysis
75105
needs: validation
@@ -100,4 +130,4 @@ jobs:
100130
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
101131
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
102132
if: env.SONAR_TOKEN != null
103-
run: ./gradlew build jacocoTestReport sonarqube --info
133+
run: ./gradlew build jacocoTestReport sonarqube --info -x verifyGoogleJavaFormat

.github/workflows/pull-request.yml

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,34 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v2
1212
- uses: gradle/wrapper-validation-action@v1
13+
14+
verify-google-java-format:
15+
name: Google Java Format Verification
16+
runs-on: ubuntu-latest
17+
needs: validation
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v2
21+
- name: Setup Java
22+
uses: actions/setup-java@v2
23+
with:
24+
distribution: 'zulu'
25+
java-version: 15
26+
- name: Cache Gradle
27+
uses: actions/cache@v2
28+
env:
29+
java-version: 15
30+
with:
31+
path: |
32+
~/.gradle/caches
33+
~/.gradle/wrapper
34+
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
35+
restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
36+
- name: Make gradlew executable
37+
run: chmod +x ./gradlew
38+
- name: Gradle Check
39+
run: ./gradlew --info build -x test
40+
1341
test:
1442
name: Test run
1543
strategy:
@@ -36,18 +64,18 @@ jobs:
3664
~/.gradle/caches
3765
~/.gradle/wrapper
3866
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
39-
restore-keys: |
40-
${{ runner.os }}-${{ env.java-version }}-gradle-
67+
restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
4168
- name: Make gradlew executable (non-Windows only)
4269
if: matrix.os != 'windows-latest'
4370
run: chmod +x ./gradlew
4471
- name: Gradle Check (non-Windows)
4572
if: matrix.os != 'windows-latest'
46-
run: ./gradlew --info check
73+
run: ./gradlew --info check -x verifyGoogleJavaFormat
4774
- name: Gradle Check (Windows)
4875
if: matrix.os == 'windows-latest'
4976
shell: cmd
50-
run: gradlew --info check
77+
run: gradlew --info check -x verifyGoogleJavaFormat
78+
5179
build:
5280
name: Sonar analysis
5381
needs: validation
@@ -84,4 +112,4 @@ jobs:
84112
env:
85113
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
86114
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
87-
run: ./gradlew build jacocoTestReport sonarqube --info
115+
run: ./gradlew build jacocoTestReport sonarqube --info -x verifyGoogleJavaFormat

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ jobs:
88
steps:
99
- uses: actions/checkout@v2
1010
- uses: gradle/wrapper-validation-action@v1
11+
1112
test:
1213
name: Test run
1314
needs: validation
@@ -34,7 +35,8 @@ jobs:
3435
- name: Make gradlew executable
3536
run: chmod +x ./gradlew
3637
- name: Gradle Check
37-
run: ./gradlew --info check
38+
run: ./gradlew --info check -x verifyGoogleJavaFormat
39+
3840
build:
3941
name: Publish release
4042
needs: test

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ build
99
bin
1010

1111
## Directory-based project format:
12-
.idea/
12+
.idea/*
13+
!.idea/codeStyles/
1314
# if you remove the above rule, at least ignore the following:
1415

1516
# User-specific stuff:

0 commit comments

Comments
 (0)