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

Verify google code format #599

Merged
merged 26 commits into from
May 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b008742
Adding customization to support /graphql endpoints that are secured
setchy May 1, 2021
32a84bc
Revert "Adding customization to support /graphql endpoints that are s…
setchy May 1, 2021
10a4744
chore: verify google code format
oliemansm May 1, 2021
68b071c
chore: update pr actions to include google code format verification
oliemansm May 1, 2021
16c1550
chore: skip google code format verification in sonar step
oliemansm May 1, 2021
f3410c2
Adding properties to configure all of the Voyager configurations (dis…
setchy May 1, 2021
5e9de57
Adding documentation to README.md for GraphQL Voyager configuration o…
setchy May 1, 2021
423f52c
Updating TOC
setchy May 1, 2021
25a13d6
chore: apply google code format
oliemansm May 1, 2021
11102ad
chore: include intellij idea code style with google code format
oliemansm May 1, 2021
eeebf6e
chore: fix javadoc with incorrect format
oliemansm May 1, 2021
2e38056
Introducing ConfigurationProperties
setchy May 1, 2021
e39cdeb
Fixing unused imports
setchy May 1, 2021
b6cee6a
Merge pull request #600 from graphql-java-kickstart/feature/voyager-l…
setchy May 2, 2021
c4e3979
chore: verify google code format
oliemansm May 1, 2021
60a76c7
chore: update pr actions to include google code format verification
oliemansm May 1, 2021
389e81e
chore: skip google code format verification in sonar step
oliemansm May 1, 2021
841264c
chore: apply google code format
oliemansm May 1, 2021
8d0226f
chore: include intellij idea code style with google code format
oliemansm May 1, 2021
83760d8
chore: fix javadoc with incorrect format
oliemansm May 1, 2021
4de9199
chore: apply google code format
oliemansm May 2, 2021
6eee341
Merge remote-tracking branch 'origin/verify-google-code-format' into …
oliemansm May 2, 2021
f637fba
chore: update google-java-format plugin in contributing guidelines
oliemansm May 2, 2021
4950334
Removing reference to Spectrum
setchy May 2, 2021
2096ec8
Adding IntelliJ External Dependencies for google-java-format. This s…
setchy May 3, 2021
f20285c
chore: fix publishing snapshot
oliemansm May 3, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 33 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,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
Expand All @@ -38,7 +66,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
Expand Down Expand Up @@ -69,7 +98,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 -x verifyGoogleJavaFormat

sonar:
name: Sonar analysis
needs: validation
Expand Down Expand Up @@ -100,4 +130,4 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
if: env.SONAR_TOKEN != null
run: ./gradlew build jacocoTestReport sonarqube --info
run: ./gradlew build jacocoTestReport sonarqube --info -x verifyGoogleJavaFormat
38 changes: 33 additions & 5 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,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
strategy:
Expand All @@ -36,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
Expand Down Expand Up @@ -84,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
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1

test:
name: Test run
needs: validation
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ build
bin

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

# User-specific stuff:
Expand Down
Loading