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

Commit beb2839

Browse files
tomas-ctomas-c
authored
Merge branch 'graphql-java-kickstart:master' into fix/reactive-subscriptions-not-closed
2 parents 43a74bb + c4faf03 commit beb2839

File tree

727 files changed

+186717
-16519
lines changed

Some content is hidden

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

727 files changed

+186717
-16519
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ A clear and concise description of what you expected to happen.
2424
If applicable, add screenshots to help explain your problem.
2525

2626
**Desktop (please complete the following information):**
27-
- OS: [e.g. iOS]
28-
- Browser [e.g. chrome, safari]
29-
- Version [e.g. 22]
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
3030

3131
**Additional context**
3232
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: Question
4-
url: https://spectrum.chat/graphql-java-kick
5-
about: Anything you are not sure about? Ask the community on Spectrum!
4+
url: https://github.com/graphql-java-kickstart/graphql-spring-boot/discussions
5+
about: Anything you are not sure about? Ask the community in Discussions!

‎.github/workflows/ci.yml‎

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- master
6+
- release/**
67

78
jobs:
89
validation:
@@ -11,6 +12,7 @@ jobs:
1112
steps:
1213
- uses: actions/checkout@v2
1314
- uses: gradle/wrapper-validation-action@v1
15+
1416
test:
1517
name: Test run
1618
needs: validation
@@ -19,8 +21,9 @@ jobs:
1921
- name: Checkout
2022
uses: actions/checkout@v2
2123
- name: Setup Java
22-
uses: actions/setup-java@v1
24+
uses: actions/setup-java@v2
2325
with:
26+
distribution: 'temurin'
2427
java-version: 8
2528
- name: Cache Gradle
2629
uses: actions/cache@v2
@@ -37,6 +40,7 @@ jobs:
3740
run: chmod +x ./gradlew
3841
- name: Gradle Check
3942
run: ./gradlew --info check
43+
4044
build:
4145
name: Publish snapshot
4246
needs: test
@@ -45,8 +49,9 @@ jobs:
4549
- name: Checkout
4650
uses: actions/checkout@v2
4751
- name: Setup Java
48-
uses: actions/setup-java@v1
52+
uses: actions/setup-java@v2
4953
with:
54+
distribution: 'temurin'
5055
java-version: 8
5156
- name: Cache Gradle
5257
uses: actions/cache@v2
@@ -62,7 +67,40 @@ jobs:
6267
- name: Make gradlew executable
6368
run: chmod +x ./gradlew
6469
- name: Gradle Publish Snapshot
70+
if: env.OSS_USER_TOKEN_KEY != null
71+
env:
72+
OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
73+
OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
74+
run: ./gradlew clean build publish -x test
75+
76+
sonar:
77+
name: Sonar analysis
78+
needs: validation
79+
runs-on: ubuntu-latest
80+
steps:
81+
- uses: actions/checkout@v2
82+
with:
83+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
84+
- name: Set up JDK 11
85+
uses: actions/setup-java@v2
86+
with:
87+
distribution: 'temurin'
88+
java-version: 11
89+
- name: Cache SonarCloud packages
90+
uses: actions/cache@v2
91+
with:
92+
path: ~/.sonar/cache
93+
key: ${{ runner.os }}-sonar
94+
restore-keys: ${{ runner.os }}-sonar
95+
- name: Cache Gradle packages
96+
uses: actions/cache@v2
97+
with:
98+
path: ~/.gradle/caches
99+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
100+
restore-keys: ${{ runner.os }}-gradle
101+
- name: Build and analyze
65102
env:
66-
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
67-
BINTRAY_PASS: ${{ secrets.BINTRAY_PASSWORD }}
68-
run: ./gradlew artifactoryPublish -Dsnapshot=true -Dbuild.number=${{ env.GITHUB_RUN_NUMBER }}
103+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
104+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
105+
if: env.SONAR_TOKEN != null
106+
run: ./gradlew build jacocoTestReport sonarqube --info

‎.github/workflows/pull-request.yml‎

Lines changed: 67 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
name: "Pull request"
22
on:
3-
push:
4-
branches-ignore:
5-
- master
63
pull_request:
4+
types: [ opened, synchronize, reopened ]
75

86
jobs:
97
validation:
@@ -12,21 +10,39 @@ jobs:
1210
steps:
1311
- uses: actions/checkout@v2
1412
- uses: gradle/wrapper-validation-action@v1
13+
14+
commitlint:
15+
name: Validate conventional commits
16+
runs-on: ubuntu-latest
17+
needs: validation
18+
steps:
19+
- uses: actions/checkout@v2
20+
name: Checkout
21+
with:
22+
fetch-depth: 0
23+
- uses: actions/setup-node@v2
24+
name: Setup Node
25+
with:
26+
node-version: 14
27+
- run: cd commitlint && npm ci && git ls-remote https://github.com/graphql-java-kickstart/graphql-spring-boot.git HEAD | grep -o '[0-9a-f]*' | xargs -I{} npx commitlint --from {} --verbose
28+
name: Run commitlint
29+
1530
test:
1631
name: Test run
1732
strategy:
1833
fail-fast: false
1934
matrix:
20-
os: [ubuntu-latest, macos-latest, windows-latest]
21-
java: [8, 11, 15]
22-
needs: validation
35+
os: [ ubuntu-latest, macos-latest, windows-latest ]
36+
java: [ 8, 11, 17 ]
37+
needs: [ validation, commitlint ]
2338
runs-on: ${{ matrix.os }}
2439
steps:
2540
- name: Checkout
2641
uses: actions/checkout@v2
2742
- name: Setup Java
28-
uses: actions/setup-java@v1
43+
uses: actions/setup-java@v2
2944
with:
45+
distribution: 'temurin'
3046
java-version: ${{ matrix.java }}
3147
- name: Cache Gradle
3248
uses: actions/cache@v2
@@ -37,8 +53,7 @@ jobs:
3753
~/.gradle/caches
3854
~/.gradle/wrapper
3955
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
40-
restore-keys: |
41-
${{ runner.os }}-${{ env.java-version }}-gradle-
56+
restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
4257
- name: Make gradlew executable (non-Windows only)
4358
if: matrix.os != 'windows-latest'
4459
run: chmod +x ./gradlew
@@ -49,3 +64,46 @@ jobs:
4964
if: matrix.os == 'windows-latest'
5065
shell: cmd
5166
run: gradlew --info check
67+
- name: Publish Unit Test Results
68+
uses: EnricoMi/publish-unit-test-result-action/composite@v1
69+
if: always() && matrix.os != 'ubuntu-latest'
70+
with:
71+
files: '**/build/test-results/**/*.xml'
72+
73+
build:
74+
name: Sonar analysis
75+
needs: test
76+
runs-on: ubuntu-latest
77+
env:
78+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
79+
steps:
80+
- uses: actions/checkout@v2
81+
if: env.SONAR_TOKEN != null
82+
with:
83+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
84+
- name: Set up JDK 11
85+
if: env.SONAR_TOKEN != null
86+
uses: actions/setup-java@v2
87+
with:
88+
distribution: 'temurin'
89+
java-version: 11
90+
- name: Cache SonarCloud packages
91+
if: env.SONAR_TOKEN != null
92+
uses: actions/cache@v2
93+
with:
94+
path: ~/.sonar/cache
95+
key: ${{ runner.os }}-sonar
96+
restore-keys: ${{ runner.os }}-sonar
97+
- name: Cache Gradle packages
98+
if: env.SONAR_TOKEN != null
99+
uses: actions/cache@v2
100+
with:
101+
path: ~/.gradle/caches
102+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
103+
restore-keys: ${{ runner.os }}-gradle
104+
- name: Build and analyze
105+
if: env.SONAR_TOKEN != null
106+
env:
107+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
108+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
109+
run: ./gradlew build jacocoTestReport sonarqube --info

‎.github/workflows/release.yml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: "Publish release"
2-
on: [workflow_dispatch]
2+
on: [ workflow_dispatch ]
33

44
jobs:
55
validation:
@@ -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: 'temurin'
2123
java-version: 8
2224
- name: Cache Gradle
2325
uses: actions/cache@v2
@@ -34,6 +36,7 @@ jobs:
3436
run: chmod +x ./gradlew
3537
- name: Gradle Check
3638
run: ./gradlew --info check
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: 'temurin'
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: 7 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:
@@ -63,3 +64,8 @@ fabric.properties
6364
# Mac
6465

6566
.DS_Store
67+
68+
# Node
69+
70+
**/node_modules
71+
**/.husky

0 commit comments

Comments
 (0)