[pull] master from rmosolgo:master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -19,12 +19,11 @@ other applicable versions (`graphql-batch`, etc)
 
 **GraphQL schema**
 
-Include relevant types and fields (in Ruby is best, in GraphQL IDL is ok).
-Are you using [interpreter](https://graphql-ruby.org/queries/interpreter.html)? Any custom instrumentation, etc?
+Include relevant types and fields (in Ruby is best, in GraphQL IDL is ok). Any custom extensions, etc?
 
 ```ruby
 class Product < GraphQL::Schema::Object
-  field :id, ID, null: false, hash_key: :id
+  field :id, ID, hash_key: :id
   # …
 end
 

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yaml

@@ -1,36 +1,43 @@
 name: CI Suite
 on:
-  - push
   - pull_request
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v7
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.4
         bundler-cache: true
     - run: bundle exec rake rubocop
+    - run: npx @herb-tools/linter@0.8.10
   system_tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: shogo82148/actions-setup-redis@v1
+      with:
+        redis-version: "7.x"
+    - run: redis-cli ping
+    - uses: actions/checkout@v7
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.4
         bundler-cache: true
       env:
-        BUNDLE_GEMFILE: ./spec/dummy/Gemfile
-    - run: bundle exec rails test:system
+        BUNDLE_GEMS__GRAPHQL__PRO: ${{ secrets.BUNDLE_GEMS__GRAPHQL__PRO }}
+        BUNDLE_GEMFILE: gemfiles/rails_master.gemfile
+    - run: bin/rails test:all
       working-directory: ./spec/dummy
+      env:
+        BUNDLE_GEMS__GRAPHQL__PRO: ${{ secrets.BUNDLE_GEMS__GRAPHQL__PRO }}
+        BUNDLE_GEMFILE: ../../gemfiles/rails_master.gemfile
   # Some coverage goals of these tests:
   # - Test once without Rails at all
   # - Test postgres, to make sure that the ActiveRecord
   #   stuff works on that (as well as the default sqlite)
   # - Test mongoid -- and several versions, since they're quite different
-  # - Run the tests with Rails _and_ TESTING_LEGACY=1 to test legacy codepaths
   # - Run the JS unit tests once
   # - Test each major version of Rails we support
   # - Test the min/max minor Ruby version we support (and others?)
@@ -40,51 +47,62 @@ jobs:
       matrix:
         include:
           - gemfile: Gemfile
-            ruby: 2.6
-          - gemfile: gemfiles/rails_3.2.gemfile
-            ruby: 2.3
-            bundler: "1"
-          - gemfile: gemfiles/rails_4.2.gemfile
-            ruby: 2.4
-            bundler: "1"
-          # Rails 5.2 is tested with Postgresql below
-          - gemfile: gemfiles/rails_6.1.gemfile
-            ruby: 2.7
-          - gemfile: gemfiles/rails_master.gemfile
-            ruby: 3.0
+            ruby: head
+          - gemfile: Gemfile
+            ruby: 2.7 # lowest supported version
+          - gemfile: gemfiles/rails_8.0.gemfile
+            ruby: 3.3
+            graphql_future: 1
+          - gemfile: gemfiles/rails_8.1.gemfile
+            ruby: 4.0
+            graphql_future: 1
+            redis: 1
           - gemfile: gemfiles/rails_master.gemfile
-            ruby: truffleruby-head
+            ruby: 3.4
+            graphql_future: 1
+            isolation_level_fiber: 1
+            redis: 1
     runs-on: ubuntu-latest
     steps:
     - run: echo BUNDLE_GEMFILE=${{ matrix.gemfile }} > $GITHUB_ENV
-    - uses: actions/checkout@v2
+    - run: echo GRAPHQL_FUTURE=1 > $GITHUB_ENV
+      if: ${{ !!matrix.graphql_future }}
+    - run: echo ISOLATION_LEVEL_FIBER=1 > $GITHUB_ENV
+      if: ${{ !!matrix.isolation_level_fiber }}
+    - uses: shogo82148/actions-setup-redis@v1
+      with:
+        redis-version: "7.x"
+      if: ${{ !!matrix.redis }}
+    - run: redis-cli ping
+      if: ${{ !!matrix.redis }}
+    - uses: actions/checkout@v7
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
-        bundler: ${{ matrix.bundler || 'default' }}
+    - run: bundle exec rake compile
     - run: bundle exec rake test
-  legacy_test:
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo BUNDLE_GEMFILE='gemfiles/rails_6.1.gemfile' > $GITHUB_ENV
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-        bundler-cache: true
-    - run: bundle exec rake test TESTING_LEGACY=1
   javascript_test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
+    - uses: actions/checkout@v7
+    - uses: actions/setup-node@v6
       with:
-        ruby-version: 2.7
-        bundler-cache: true
-    - run: bundle exec rake js:all
+        node-version: latest
+    - run: npm ci
+      working-directory: ./javascript_client
+    - run: npm test
+      working-directory: ./javascript_client
   postgres_test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+        - gemfile: gemfiles/rails_master.gemfile
+          ruby: 3.3
+          isolation_level_fiber: 1
+        - gemfile: gemfiles/rails_7.2_postgresql.gemfile
+          ruby: 3.3
     services:
       postgres:
         image: postgres:latest
@@ -101,33 +119,36 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     steps:
-    - run: echo BUNDLE_GEMFILE='gemfiles/rails_5.2_postgresql.gemfile' > $GITHUB_ENV
+    - run: echo BUNDLE_GEMFILE='' > $GITHUB_ENV
     - run: echo DATABASE='POSTGRESQL' > $GITHUB_ENV
     - run: echo PGPASSWORD='postgres' > $GITHUB_ENV
-    - uses: actions/checkout@v2
+    - run: echo GRAPHQL_CPARSER=1 > $GITHUB_ENV
+    - run: echo ISOLATION_LEVEL_FIBER=1 > $GITHUB_ENV
+      if: ${{ !!matrix.isolation_level_fiber }}
+    - uses: actions/checkout@v7
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: "3.3"
         bundler-cache: true
-    - run: bundle exec rake test
+    - run: bundle exec rake compile test
   mongodb_test:
     strategy:
       fail-fast: false
       matrix:
         gemfile:
-          - gemfiles/mongoid_6.gemfile
-          - gemfiles/mongoid_7.gemfile
+          - gemfiles/mongoid_9.gemfile
+          - gemfiles/mongoid_8.gemfile
     runs-on: ubuntu-latest
     services:
       mongodb:
-        image: mongo:3.4.23
+        image: mongo
         ports:
         - 27017:27017
     steps:
     - run: echo BUNDLE_GEMFILE=${{ matrix.gemfile }} > $GITHUB_ENV
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v7
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.4
         bundler-cache: true
-    - run: bundle exec rake test
+    - run: bundle exec rake compile test

.github/workflows/pronto.yaml

@@ -0,0 +1,22 @@
+name: Pronto
+on:
+  - pull_request_target
+
+jobs:
+  pronto:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo BUNDLE_GEMFILE=gemfiles/pronto.gemfile > $GITHUB_ENV
+      - name: Checkout code
+        uses: actions/checkout@v7
+      - run: git fetch --no-tags --prune --unshallow origin +refs/heads/*:refs/remotes/origin/*
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.4
+          bundler-cache: true
+      - name: Run Pronto
+        run: bundle exec pronto run -f github_pr -c origin/${{ github.base_ref }}
+        env:
+          PRONTO_PULL_REQUEST_ID: ${{ github.event.pull_request.number }}
+          PRONTO_GITHUB_ACCESS_TOKEN: "${{ github.token }}"

.github/workflows/website.yaml

@@ -1,42 +1,90 @@
 name: Publish Website
 on:
+  # For some reason, `on: release: ...` didn't work with `nektos/act`
   push:
-    branches: [master]
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+  workflow_dispatch:
+    inputs:
+      publish_website:
+        description: "Publish guides to website?"
+        type: boolean
+        required: true
+        default: true
+      publish_version:
+        description: "If present, pull this GraphQL-Ruby version to rebuild API docs"
+        required: false
+        type: string
 
+permissions: {}
 jobs:
-  build:
+  website:
+    if: ${{ inputs.publish_website || github.ref_name }}
+    permissions:
+      contents: write
     name: Publish Website
     runs-on: ubuntu-latest
     steps:
       - name: Checkout master
-        uses: actions/checkout@v2
+        uses: actions/checkout@v7
       - name: Checkout GitHub pages branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v7
         with:
           path: gh-pages
           ref: gh-pages
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
-      - name: Bundle install
-        run: |
-          gem install bundler
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          ruby-version: '3.1'
+          bundler-cache: true
       - name: Build HTML, reindex
         env:
           ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
         run: |
           bundle exec rake site:fetch_latest site:build_doc site:update_search_index site:clean_html site:build_html
       - name: Commit changes as last committer
         run: |
-          git config --global user.name "%(git log --format="%aN" -n 1)"
-          git config --global user.email "%(git log --format="%aE" -n 1)"
+          git config --global user.name "$(git log --format="%aN" -n 1)"
+          git config --global user.email "$(git log --format="%aE" -n 1)"
           bundle exec rake site:commit_changes
       - name: Deploy to GitHub pages via gh-pages branch
-        uses: s0/git-publish-subdir-action@master
-        env:
-          REPO: self
-          BRANCH: gh-pages
-          FOLDER: gh-pages
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./gh-pages
+  api_docs:
+    needs: website
+    if: ${{ inputs.publish_version || github.ref_name }}
+    permissions:
+      contents: write
+    name: Publish API Docs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout release tag
+        uses: actions/checkout@v7
+        with:
+          ref: ${{ env.GITHUB_REF }}
+      - name: Checkout GitHub pages branch
+        uses: actions/checkout@v7
+        with:
+          path: gh-pages
+          ref: gh-pages
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2'
+          bundler-cache: true
+      - name: Build API docs
+        run: |
+          bundle exec rake site:fetch_latest apidocs:gen_version["${{ inputs.publish_version || env.GITHUB_REF }}"]
+      - name: Commit changes as rmosolgo
+        run: |
+          git config --global user.name rmosolgo
+          git config --global user.email rdmosolgo@gmail.com
+          git status
+          bundle exec rake site:commit_changes
+          git status
+      - name: Deploy to GitHub pages via gh-pages branch
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./gh-pages