CI/CD Improvements

.github/workflows/master.yml

@@ -4,14 +4,14 @@ on:
   push:
     branches:
       - master
+
 jobs:
   buildAndPublish:
     runs-on: ubuntu-latest
     env:
       MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }}
       MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
       MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }}
-
     steps:
       - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
@@ -20,5 +20,15 @@ jobs:
         with:
           java-version: '11'
           distribution: 'corretto'
-      - name: build test and publish
-        run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace
+      - name: Build
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assemble
+      - name: Test
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: check --info
+      - name: Publish
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace

.github/workflows/pull_request.yml

@@ -1,4 +1,4 @@
-name: Pull Request Build
+name: PR Verify
 # For pull requests: builds and test
 on:
   push:
@@ -11,16 +11,53 @@ on:
       - 19.x
       - 18.x
       - 17.x
+
 jobs:
   buildAndTest:
-    runs-on: ubuntu-latest
+    name: buildAndTest ${{ matrix.java }} (${{ matrix.dist }}) on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ 'ubuntu-latest', 'windows-latest' ]
+        java: [ '11', '17', '21' ]
+        dist: [ 'temurin', 'semeru' ]
+        exclude:
+          - # Unsupported
+            os: 'ubuntu-latest'
+            java: '21'
+            dist: 'semeru'
+          - # Unsupported
+            os: 'windows-latest'
+            java: '21'
+            dist: 'semeru'
+    env:
+      ORG_GRADLE_PROJECT_javaVersion: ${{ matrix.java }}
     steps:
       - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 11
+      - name: Set up JDK (${{ matrix.java }}, ${{ matrix.dist }})
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
-          distribution: 'corretto'
-      - name: build and test
-        run: ./gradlew assemble && ./gradlew check --info --stacktrace
+          java-version: ${{ matrix.java }}
+          distribution: ${{ matrix.dist }}
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: --version
+      - name: Build
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assemble
+      - name: Test
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: check --info --stacktrace
+      - name: Archive Gradle Test Summary
+        uses: actions/upload-artifact@v3
+        if: ${{ failure() }}
+        with:
+          name: gradle-test-summary-${{ matrix.java }}-${{ matrix.dist }}-${{ matrix.os }}
+          path: build/reports/tests/test/
+          retention-days: 5
+          if-no-files-found: ignore

.github/workflows/release.yml

@@ -15,7 +15,6 @@ jobs:
       MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }}
       MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
       RELEASE_VERSION: ${{ github.event.inputs.version }}
-
     steps:
       - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
@@ -24,5 +23,15 @@ jobs:
         with:
           java-version: '11'
           distribution: 'corretto'
-      - name: build test and publish
-        run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace
+      - name: Build
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assemble
+      - name: Test
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: check --info
+      - name: Publish
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace

build.gradle

@@ -14,9 +14,16 @@ plugins {
     id "me.champeau.jmh" version "0.7.1"
 }
 
+final String javaVersion = project.hasProperty("javaVersion") ?
+        (project.property("javaVersion") as String).replaceAll("^([0-9]+).*", "\$1")
+        : null
+if (javaVersion == null) {
+    throw new Throwable("Please define a javaVersion in your gradle.properties")
+}
+
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(javaVersion)
     }
 }
 

gradle.properties

@@ -2,3 +2,5 @@ org.gradle.caching=true
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8
+
+javaVersion=11

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -13,4 +13,8 @@ pluginManagement {
     }
 }
 
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+}
+
 rootProject.name = 'graphql-java'

src/test/groovy/graphql/parser/LineNumberingTest.groovy

@@ -3,6 +3,9 @@ package graphql.parser
 import graphql.language.Field
 import graphql.language.FragmentDefinition
 import graphql.language.OperationDefinition
+import org.spockframework.runtime.extension.builtin.PreconditionContext
+import spock.lang.IgnoreIf
+import spock.lang.Issue
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -44,6 +47,8 @@ fragment X on Book {
 
     }
 
+    @Issue("https://github.com/graphql-java/graphql-java/issues/2709")
+    @IgnoreIf({ PreconditionContext it -> it.jvm.java16Compatible })
     def "multi source line numbering works as expected"() {
         def queryBit1 = '''query X {
    field1

src/test/groovy/graphql/parser/MultiSourceReaderTest.groovy

@@ -1,5 +1,8 @@
 package graphql.parser
 
+import org.spockframework.runtime.extension.builtin.PreconditionContext
+import spock.lang.IgnoreIf
+import spock.lang.Issue
 import spock.lang.Specification
 
 class MultiSourceReaderTest extends Specification {
@@ -10,6 +13,8 @@ class MultiSourceReaderTest extends Specification {
         multiSource.close()
     }
 
+    // Does not work on Windows
+    @IgnoreIf({ PreconditionContext it -> it.os.windows })
     def "can combine files"() {
         when:
         multiSource = MultiSourceReader.newMultiSourceReader()
@@ -157,6 +162,8 @@ B5*******X
         multiSource.getOverallLineNumber() == 0
     }
 
+    @Issue("https://github.com/graphql-java/graphql-java/issues/2709")
+    @IgnoreIf({ PreconditionContext it -> it.jvm.java16Compatible })
     def "can handle null source name"() {
         def sr = new StringReader("Hello\nWorld")
         when:

src/test/groovy/graphql/parser/ParserExceptionTest.groovy

@@ -3,6 +3,9 @@ package graphql.parser
 import graphql.GraphQL
 import graphql.InvalidSyntaxError
 import graphql.StarWarsSchema
+import org.spockframework.runtime.extension.builtin.PreconditionContext
+import spock.lang.IgnoreIf
+import spock.lang.Issue
 import spock.lang.Specification
 
 class ParserExceptionTest extends Specification {
@@ -46,6 +49,8 @@ fragment X on SomeType {
 '''
     }
 
+    @Issue("https://github.com/graphql-java/graphql-java/issues/2709")
+    @IgnoreIf({ PreconditionContext it -> it.jvm.java16Compatible })
     def "can work with multi source input"() {
         when:
         def multiSource = MultiSourceReader.newMultiSourceReader()

src/test/groovy/graphql/schema/idl/TypeDefinitionRegistryTest.groovy

@@ -23,6 +23,9 @@ import graphql.parser.MultiSourceReader
 import graphql.schema.GraphQLTypeUtil
 import graphql.schema.idl.errors.SchemaProblem
 import graphql.schema.idl.errors.SchemaRedefinitionError
+import org.spockframework.runtime.extension.builtin.PreconditionContext
+import spock.lang.IgnoreIf
+import spock.lang.Issue
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -1077,6 +1080,8 @@ class TypeDefinitionRegistryTest extends Specification {
                         "Foo", "Bar", "FooScalar", "FooDirective", "Extra", "ExtraInterface"]
     }
 
+    @Issue("https://github.com/graphql-java/graphql-java/issues/2709")
+    @IgnoreIf({ PreconditionContext it -> it.jvm.java16Compatible })
     def "multi source reader works"() {
 
         def sdl1 = '''

src/test/groovy/graphql/util/AnonymizerTest.groovy

@@ -723,39 +723,39 @@ type Object1 {
 
         then:
         newSchema == """\
-            schema @Directive1(argument1 : "stringValue1"){
-              query: Object1
-            }
-            
-            directive @Directive1(argument1: String! = "stringValue4") repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
-            
-            interface Interface1 @Directive1(argument1 : "stringValue12") {
-              field2: String
-              field3: Enum1
-            }
-            
-            union Union1 @Directive1(argument1 : "stringValue21") = Object2
-            
-            type Object1 @Directive1(argument1 : "stringValue8") {
-              field1: Interface1 @Directive1(argument1 : "stringValue9")
-              field4: Union1 @deprecated
-            }
-            
-            type Object2 implements Interface1 {
-              field2: String
-              field3: Enum1
-              field5(argument2: InputObject1): String
-            }
-            
-            enum Enum1 @Directive1(argument1 : "stringValue15") {
-              EnumValue1 @Directive1(argument1 : "stringValue18")
-              EnumValue2
-            }
-            
-            input InputObject1 @Directive1(argument1 : "stringValue24") {
-              inputField1: Int @Directive1(argument1 : "stringValue27")
-            }
-        """.stripIndent()
+schema @Directive1(argument1 : "stringValue1"){
+  query: Object1
+}
+
+directive @Directive1(argument1: String! = "stringValue4") repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+
+interface Interface1 @Directive1(argument1 : "stringValue12") {
+  field2: String
+  field3: Enum1
+}
+
+union Union1 @Directive1(argument1 : "stringValue21") = Object2
+
+type Object1 @Directive1(argument1 : "stringValue8") {
+  field1: Interface1 @Directive1(argument1 : "stringValue9")
+  field4: Union1 @deprecated
+}
+
+type Object2 implements Interface1 {
+  field2: String
+  field3: Enum1
+  field5(argument2: InputObject1): String
+}
+
+enum Enum1 @Directive1(argument1 : "stringValue15") {
+  EnumValue1 @Directive1(argument1 : "stringValue18")
+  EnumValue2
+}
+
+input InputObject1 @Directive1(argument1 : "stringValue24") {
+  inputField1: Int @Directive1(argument1 : "stringValue27")
+}
+"""
     }
 
     def "query with directives"() {

src/test/groovy/graphql/validation/rules/ExecutableDefinitionsTest.groovy

@@ -47,20 +47,21 @@ class ExecutableDefinitionsTest extends Specification {
 
     def 'Executable Definitions with type definition'() {
         def query = """
-              query Foo {
-                dog {
-                  name
-                }
-              }
-
-              type Cow {
-                name: String
-              }
-
-              extend type Dog {
-                color: String
-              }
-            """.stripIndent()
+query Foo {
+  dog {
+    name
+  }
+}
+
+type Cow {
+  name: String
+}
+
+extend type Dog {
+  color: String
+}
+"""
+
         when:
         def validationErrors = validate(query)
 
@@ -77,14 +78,15 @@ class ExecutableDefinitionsTest extends Specification {
 
     def 'Executable Definitions with schema definition'() {
         def query = """
-              schema {
-                query: QueryRoot
-              }
-
-              type QueryRoot {
-                test: String
-              }
-            """.stripIndent()
+schema {
+  query: QueryRoot
+}
+
+type QueryRoot {
+  test: String
+}
+"""
+
         when:
         def validationErrors = validate(query)
 
@@ -118,7 +120,7 @@ class ExecutableDefinitionsTest extends Specification {
 
     def 'Executable Definitions with no directive definition'() {
         def query = """
-              directive @nope on INPUT_OBJECT
+            directive @nope on INPUT_OBJECT
             """.stripIndent()
         when:
         def document = new Parser().parseDocument(query)