Skip to content

Commit b502921

Browse files
bbakermanbbakerman
committed
Merge remote-tracking branch 'origin/master' into record-test-times
2 parents b440f38 + ac5367d commit b502921

File tree

49 files changed

+15190
-698
lines changed

Some content is hidden

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

49 files changed

+15190
-698
lines changed

‎.github/workflows/master.yml‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,21 @@ on:
77
permissions: # For test summary bot
88
checks: write
99
jobs:
10-
buildAndPublish:
10+
buildAndTest:
1111
runs-on: ubuntu-latest
12-
env:
13-
MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }}
14-
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
15-
MAVEN_CENTRAL_USER_NEW: ${{ secrets.MAVEN_CENTRAL_USER_NEW }}
16-
MAVEN_CENTRAL_PASSWORD_NEW: ${{ secrets.MAVEN_CENTRAL_PASSWORD_NEW }}
17-
MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }}
18-
12+
strategy:
13+
matrix:
14+
gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17', 'test -x testWithJava11 -x testWithJava17' ]
1915
steps:
2016
- uses: actions/checkout@v5
21-
- uses: gradle/actions/wrapper-validation@v4
17+
- uses: gradle/actions/wrapper-validation@v5
2218
- name: Set up JDK 21
2319
uses: actions/setup-java@v5
2420
with:
2521
java-version: '21'
2622
distribution: 'corretto'
27-
- name: build test and publish
28-
run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace
23+
- name: build and test
24+
run: ./gradlew ${{matrix.gradle-argument}} --info --stacktrace
2925
- name: Publish Test Results
3026
uses: EnricoMi/publish-unit-test-result-action@v2.20.0
3127
if: always()
@@ -34,3 +30,23 @@ jobs:
3430
**/build/test-results/test/TEST-*.xml
3531
**/build/test-results/testWithJava11/TEST-*.xml
3632
**/build/test-results/testWithJava17/TEST-*.xml
33+
publishToMavenCentral:
34+
needs: buildAndTest
35+
runs-on: ubuntu-latest
36+
env:
37+
MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }}
38+
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
39+
MAVEN_CENTRAL_USER_NEW: ${{ secrets.MAVEN_CENTRAL_USER_NEW }}
40+
MAVEN_CENTRAL_PASSWORD_NEW: ${{ secrets.MAVEN_CENTRAL_PASSWORD_NEW }}
41+
MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }}
42+
43+
steps:
44+
- uses: actions/checkout@v5
45+
- uses: gradle/actions/wrapper-validation@v5
46+
- name: Set up JDK 21
47+
uses: actions/setup-java@v5
48+
with:
49+
java-version: '21'
50+
distribution: 'corretto'
51+
- name: publishToMavenCentral
52+
run: ./gradlew assemble && ./gradlew check -x test -x testng --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace

‎.github/workflows/pull_request.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,24 @@ permissions: # For test comment bot
1818
jobs:
1919
buildAndTest:
2020
runs-on: ubuntu-latest
21+
strategy:
22+
matrix:
23+
gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17', 'test -x testWithJava11 -x testWithJava17' ]
2124
steps:
2225
- uses: actions/checkout@v5
23-
- uses: gradle/actions/wrapper-validation@v4
26+
- uses: gradle/actions/wrapper-validation@v5
2427
- name: Set up JDK 21
2528
uses: actions/setup-java@v5
2629
with:
2730
java-version: '21'
2831
distribution: 'corretto'
2932
- name: build and test
30-
run: ./gradlew assemble && ./gradlew check --info --stacktrace
33+
run: ./gradlew ${{matrix.gradle-argument}} --info --stacktrace
3134
- name: Publish Test Results
3235
uses: EnricoMi/publish-unit-test-result-action@v2.20.0
3336
if: always()
3437
with:
35-
files: '**/build/test-results/test/TEST-*.xml'
36-
38+
files: |
39+
**/build/test-results/test/TEST-*.xml
40+
**/build/test-results/testWithJava11/TEST-*.xml
41+
**/build/test-results/testWithJava17/TEST-*.xml

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- uses: actions/checkout@v5
23-
- uses: gradle/actions/wrapper-validation@v4
23+
- uses: gradle/actions/wrapper-validation@v5
2424
- name: Set up JDK 21
2525
uses: actions/setup-java@v5
2626
with:

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jar {
119119
}
120120

121121
dependencies {
122-
api 'com.graphql-java:java-dataloader:5.0.2'
122+
api 'com.graphql-java:java-dataloader:5.0.3'
123123
api 'org.reactivestreams:reactive-streams:' + reactiveStreamsVersion
124124
api "org.jspecify:jspecify:1.0.0"
125125

@@ -128,7 +128,7 @@ dependencies {
128128

129129
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
130130
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
131-
testImplementation 'net.bytebuddy:byte-buddy:1.17.7'
131+
testImplementation 'net.bytebuddy:byte-buddy:1.17.8'
132132
testImplementation 'org.objenesis:objenesis:3.4'
133133
testImplementation 'org.apache.groovy:groovy:4.0.28"'
134134
testImplementation 'org.apache.groovy:groovy-json:4.0.28'
@@ -155,7 +155,7 @@ dependencies {
155155
// comment this in if you want to run JMH benchmarks from idea
156156
// jmhAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
157157

158-
errorprone 'com.uber.nullaway:nullaway:0.12.9'
158+
errorprone 'com.uber.nullaway:nullaway:0.12.10'
159159
errorprone 'com.google.errorprone:error_prone_core:2.42.0'
160160

161161
// just tests - no Kotlin otherwise

0 commit comments

Comments
 (0)