Skip to content

Commit f35b798

Browse files
NokinoriNokinori
authored
Merge pull request #1 from graphql-java-kickstart/master
Merge from original repo
2 parents 9dc6d2e + f6552aa commit f35b798

File tree

304 files changed

+4811
-3339
lines changed

Some content is hidden

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

304 files changed

+4811
-3339
lines changed

‎.github/workflows/ci.yml

Lines changed: 45 additions & 11 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
@@ -20,8 +48,9 @@ jobs:
2048
- name: Checkout
2149
uses: actions/checkout@v2
2250
- name: Setup Java
23-
uses: actions/setup-java@v1
51+
uses: actions/setup-java@v2
2452
with:
53+
distribution: 'zulu'
2554
java-version: 8
2655
- name: Cache Gradle
2756
uses: actions/cache@v2
@@ -37,7 +66,8 @@ jobs:
3766
- name: Make gradlew executable
3867
run: chmod +x ./gradlew
3968
- name: Gradle Check
40-
run: ./gradlew --info check
69+
run: ./gradlew --info check -x verifyGoogleJavaFormat
70+
4171
build:
4272
name: Publish snapshot
4373
needs: test
@@ -46,8 +76,9 @@ jobs:
4676
- name: Checkout
4777
uses: actions/checkout@v2
4878
- name: Setup Java
49-
uses: actions/setup-java@v1
79+
uses: actions/setup-java@v2
5080
with:
81+
distribution: 'zulu'
5182
java-version: 8
5283
- name: Cache Gradle
5384
uses: actions/cache@v2
@@ -63,11 +94,12 @@ jobs:
6394
- name: Make gradlew executable
6495
run: chmod +x ./gradlew
6596
- name: Gradle Publish Snapshot
66-
if: env.BINTRAY_USER != 'SKIP_BINTRAY_PUBLISH'
97+
if: env.OSS_USER_TOKEN_KEY != null
6798
env:
68-
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
69-
BINTRAY_PASS: ${{ secrets.BINTRAY_PASSWORD }}
70-
run: ./gradlew artifactoryPublish -Dsnapshot=true -Dbuild.number=${{ env.GITHUB_RUN_NUMBER }}
99+
OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
100+
OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
101+
run: ./gradlew clean build publish -x test -x verifyGoogleJavaFormat
102+
71103
sonar:
72104
name: Sonar analysis
73105
needs: validation
@@ -77,17 +109,18 @@ jobs:
77109
with:
78110
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
79111
- name: Set up JDK 11
80-
uses: actions/setup-java@v1
112+
uses: actions/setup-java@v2
81113
with:
114+
distribution: 'zulu'
82115
java-version: 11
83116
- name: Cache SonarCloud packages
84-
uses: actions/cache@v1
117+
uses: actions/cache@v2
85118
with:
86119
path: ~/.sonar/cache
87120
key: ${{ runner.os }}-sonar
88121
restore-keys: ${{ runner.os }}-sonar
89122
- name: Cache Gradle packages
90-
uses: actions/cache@v1
123+
uses: actions/cache@v2
91124
with:
92125
path: ~/.gradle/caches
93126
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -96,4 +129,5 @@ jobs:
96129
env:
97130
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
98131
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
99-
run: ./gradlew build jacocoTestReport sonarqube --info
132+
if: env.SONAR_TOKEN != null
133+
run: ./gradlew build jacocoTestReport sonarqube --info -x verifyGoogleJavaFormat

‎.github/workflows/pull-request.yml

Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,50 @@ 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:
1644
fail-fast: false
1745
matrix:
1846
os: [ ubuntu-latest, macos-latest, windows-latest ]
19-
java: [ 8, 11, 15 ]
47+
java: [ 8, 11, 16 ]
2048
needs: validation
2149
runs-on: ${{ matrix.os }}
2250
steps:
2351
- name: Checkout
2452
uses: actions/checkout@v2
2553
- name: Setup Java
26-
uses: actions/setup-java@v1
54+
uses: actions/setup-java@v2
2755
with:
56+
distribution: 'zulu'
2857
java-version: ${{ matrix.java }}
2958
- name: Cache Gradle
3059
uses: actions/cache@v2
@@ -35,18 +64,18 @@ jobs:
3564
~/.gradle/caches
3665
~/.gradle/wrapper
3766
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
38-
restore-keys: |
39-
${{ runner.os }}-${{ env.java-version }}-gradle-
67+
restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
4068
- name: Make gradlew executable (non-Windows only)
4169
if: matrix.os != 'windows-latest'
4270
run: chmod +x ./gradlew
4371
- name: Gradle Check (non-Windows)
4472
if: matrix.os != 'windows-latest'
45-
run: ./gradlew --info check
73+
run: ./gradlew --info check -x verifyGoogleJavaFormat
4674
- name: Gradle Check (Windows)
4775
if: matrix.os == 'windows-latest'
4876
shell: cmd
49-
run: gradlew --info check
77+
run: gradlew --info check -x verifyGoogleJavaFormat
78+
5079
build:
5180
name: Sonar analysis
5281
needs: validation
@@ -60,19 +89,20 @@ jobs:
6089
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
6190
- name: Set up JDK 11
6291
if: env.SONAR_TOKEN != null
63-
uses: actions/setup-java@v1
92+
uses: actions/setup-java@v2
6493
with:
94+
distribution: 'zulu'
6595
java-version: 11
6696
- name: Cache SonarCloud packages
6797
if: env.SONAR_TOKEN != null
68-
uses: actions/cache@v1
98+
uses: actions/cache@v2
6999
with:
70100
path: ~/.sonar/cache
71101
key: ${{ runner.os }}-sonar
72102
restore-keys: ${{ runner.os }}-sonar
73103
- name: Cache Gradle packages
74104
if: env.SONAR_TOKEN != null
75-
uses: actions/cache@v1
105+
uses: actions/cache@v2
76106
with:
77107
path: ~/.gradle/caches
78108
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -82,4 +112,4 @@ jobs:
82112
env:
83113
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
84114
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
85-
run: ./gradlew build jacocoTestReport sonarqube --info
115+
run: ./gradlew build jacocoTestReport sonarqube --info -x verifyGoogleJavaFormat

‎.github/workflows/release.yml

Lines changed: 15 additions & 5 deletions
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
@@ -16,8 +17,9 @@ jobs:
1617
- name: Checkout
1718
uses: actions/checkout@v2
1819
- name: Setup Java
19-
uses: actions/setup-java@v1
20+
uses: actions/setup-java@v2
2021
with:
22+
distribution: 'zulu'
2123
java-version: 8
2224
- name: Cache Gradle
2325
uses: actions/cache@v2
@@ -33,7 +35,8 @@ jobs:
3335
- name: Make gradlew executable
3436
run: chmod +x ./gradlew
3537
- name: Gradle Check
36-
run: ./gradlew --info check
38+
run: ./gradlew --info check -x verifyGoogleJavaFormat
39+
3740
build:
3841
name: Publish release
3942
needs: test
@@ -42,8 +45,9 @@ jobs:
4245
- name: Checkout
4346
uses: actions/checkout@v2
4447
- name: Setup Java
45-
uses: actions/setup-java@v1
48+
uses: actions/setup-java@v2
4649
with:
50+
distribution: 'zulu'
4751
java-version: 8
4852
- name: Cache Gradle
4953
uses: actions/cache@v2
@@ -58,10 +62,16 @@ jobs:
5862
${{ runner.os }}-${{ env.java-version }}-gradle-
5963
- name: Make gradlew executable
6064
run: chmod +x ./gradlew
65+
- name: Prepare environment
66+
env:
67+
GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}
68+
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.GPG_SIGNING_SECRET_KEY_RING_FILE }}
69+
run: sudo bash -c "echo '$GPG_KEY_CONTENTS' | base64 -d > '$SIGNING_SECRET_KEY_RING_FILE'"
6170
- name: Publish release
6271
env:
63-
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
64-
BINTRAY_PASS: ${{ secrets.BINTRAY_PASSWORD }}
72+
SIGNING_KEY_ID: ${{ secrets.GPG_SIGNING_KEY_ID }}
73+
SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
74+
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.GPG_SIGNING_SECRET_KEY_RING_FILE }}
6575
OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
6676
OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
6777
run: bash github-build.sh

‎.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)