Integration test: 2026-08-04

.github/workflows/linting.yml

@@ -97,11 +97,14 @@ jobs:
 
     - name: Run rbs validate
       run: bundle exec rbs validate
-      # @todo Temporary, expect to revert in 0.60
-      continue-on-error: true
   rubocop_todo:
     name: .rubocop_todo.yml
+    continue-on-error: true
     runs-on: ubuntu-latest
+    # Needed only so the auto-update step (push-to-master only, below) can
+    # push a commit back to the branch it checked out.
+    permissions:
+      contents: write
 
     steps:
     - uses: actions/checkout@v3
@@ -116,14 +119,19 @@ jobs:
 
     - name: Run RuboCop
       run: bundle exec rubocop -c .rubocop.yml
-      # @todo Temporary, expect to revert in 0.60
-      continue-on-error: true
 
+    # PRs and other non-master events: contributors are expected to have
+    # regenerated .rubocop_todo.yml locally and committed it; fail with the
+    # diff if they didn't. We can't auto-push here because GITHUB_TOKEN
+    # can't write to a fork's branch, which is where most PRs come from.
     - name: Run RuboCop against todo file
-      continue-on-error: true
+      if: github.event_name != 'push' || github.ref != 'refs/heads/master'
       run: |
         cmd="bundle exec rubocop --auto-gen-config --exclude-limit=5 --no-offense-counts --no-auto-gen-timestamp"
-        ${cmd:?}
+        # --auto-gen-config's exit code reflects the underlying offense count,
+        # not whether new offenses were introduced; the git diff check below
+        # is the actual pass/fail signal.
+        ${cmd:?} || true
         set +e
         if [ -n "$(git status --porcelain)" ]
         then
@@ -132,3 +140,26 @@ jobs:
            >&2 echo "Please address any new issues, then run '${cmd:?}' and push up any improvements"
            exit 1
         fi
+
+    # master only: the "Run RuboCop" step above already proved the tree is
+    # clean against the current .rubocop_todo.yml, so any diff here can only
+    # be a shrink (offenses that got fixed without their todo entry being
+    # removed) -- never a new offense. Commit and push that cleanup instead
+    # of asking someone to do it by hand.
+    - name: Auto-update .rubocop_todo.yml
+      if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+      continue-on-error: true
+      run: |
+        cmd="bundle exec rubocop --auto-gen-config --exclude-limit=5 --no-offense-counts --no-auto-gen-timestamp"
+        ${cmd:?} || true
+        if [ -n "$(git status --porcelain -- .rubocop_todo.yml)" ]
+        then
+          git diff -u -- .rubocop_todo.yml
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add .rubocop_todo.yml
+          git commit -m "Auto-update .rubocop_todo.yml [skip ci]"
+          git push origin HEAD:master
+        else
+          echo "No .rubocop_todo.yml cleanup needed."
+        fi

.github/workflows/plugins.yml

@@ -45,8 +45,6 @@ jobs:
       run: bundle exec rbs collection update
     - name: Ensure typechecking still works
       run: bundle exec solargraph typecheck --level strong
-      # @todo Temporary, expect to revert in 0.60
-      continue-on-error: true
     - name: Ensure specs still run
       run: bundle exec rake spec
   rails:
@@ -80,8 +78,6 @@ jobs:
       run: bundle exec rbs collection update
     - name: Ensure typechecking still works
       run: bundle exec solargraph typecheck --level strong
-      # @todo Temporary, expect to revert in 0.60
-      continue-on-error: true
     - name: Ensure specs still run
       run: bundle exec rake spec
   rspec:
@@ -113,8 +109,6 @@ jobs:
       run: bundle exec rbs collection update
     - name: Ensure typechecking still works
       run: bundle exec solargraph typecheck --level strong
-      # @todo Temporary, expect to revert in 0.60
-      continue-on-error: true
     - name: Ensure specs still run
       run: bundle exec rake spec
 
@@ -126,10 +120,13 @@ jobs:
       BUNDLE_PATH: ${{ github.workspace }}/../solargraph-rspec/vendor/bundle
     steps:
     - uses: actions/checkout@v3
-    - name: clone https://github.com/lekemula/solargraph-rspec/
+    # lekemula/solargraph-rspec#36 raises the expectations this branch's
+    # more precise Array literal inference now satisfies.
+    - name: clone https://github.com/lekemula/solargraph-rspec/ pull/36
       run: |
        cd ..
-       git clone https://github.com/lekemula/solargraph-rspec.git
+       # git clone https://github.com/lekemula/solargraph-rspec.git
+       git clone --branch fix-hash-literal-type-precision https://github.com/apiology/solargraph-rspec.git
        cd solargraph-rspec
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
@@ -192,7 +189,7 @@ jobs:
         # solargraph-rails supports Ruby 3.0+
         # This job uses 3.2 due to a problem compiling sqlite3 in earlier versions
         ruby-version: '3.2'
-        bundler-cache: false
+        bundler-cache: true
         # https://github.com/apiology/solargraph/actions/runs/19400815835/job/55508092473?pr=17
         rubygems: latest
         bundler: latest
@@ -231,5 +228,3 @@ jobs:
         ALLOW_IMPROVEMENTS=true bundle exec rake spec
       env:
         MATRIX_RAILS_VERSION: "7.0"
-      # @todo Temporary, expect to revert in 0.60
-      continue-on-error: true

.github/workflows/rspec.yml

@@ -25,21 +25,28 @@ jobs:
         #   It currently 404s ("Unavailable version head for ruby"), failing CI:
         #   https://github.com/castwide/solargraph/actions/runs/25863741955/job/76000137015?pr=1187
         ruby-version: ['3.1', '3.2', '3.3', '3.4', '4.0']
-        rbs-version: ['3.10.0', '4.0.0', '4.0.1', '4.0.2']
+        rbs-version: ['3.10.0', '4.0.3', '4.1.1']
         exclude:
           - ruby-version: '3.1'
-            rbs-version: '4.0.0'
+            rbs-version: '4.0.3'
           - ruby-version: '3.1'
-            rbs-version: '4.0.1'
-          - ruby-version: '3.1'
-            rbs-version: '4.0.2'
+            rbs-version: '4.1.1'
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
+        # Without this pin, ruby/setup-ruby uses whatever bundler ships
+        # with each matrix Ruby version individually, rather than one
+        # consistent version across the matrix. Confirmed by removing
+        # it: stdlib/default-gem resolution changed enough that
+        # Workspace::Gemspecs#resolve_require('yaml') started returning
+        # nil, failing spec/api_map_method_spec.rb's YAML test across
+        # most of the matrix. Keep this in sync with Gemfile.lock's
+        # BUNDLED WITH version, and with the same pin below.
+        bundler: 2.5.23
     - name: Set rbs version
       run: echo "gem 'rbs', '${{ matrix.rbs-version }}'" >> .Gemfile
     #  /home/runner/.rubies/ruby-head/lib/ruby/gems/3.5.0+2/gems/rbs-3.9.4/lib/rbs.rb:11:
@@ -57,6 +64,7 @@ jobs:
       run: bundle exec rake spec
   undercover:
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
     - uses: actions/checkout@v3
       with:
@@ -67,11 +75,18 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: '3.4'
+        # See the matching pin in the rspec matrix job above for why
+        # this is needed - keep both in sync with Gemfile.lock's
+        # BUNDLED WITH version.
+        bundler: 2.5.23
         bundler-cache: true
+    - name: Install gems
+      run: |
+        bundle _2.5.23_ install
+        bundle update rbs # use latest available for this Ruby version
     - name: Update types
       run: bundle exec rbs collection update
     - name: Run tests
       run: bundle exec rake spec
     - name: Check PR coverage
       run: bundle exec rake undercover
-      continue-on-error: true

.github/workflows/typecheck.yml

@@ -38,5 +38,3 @@ jobs:
       run: bundle exec rbs collection install
     - name: Typecheck self
       run: SOLARGRAPH_ASSERTS=on bundle exec solargraph typecheck --level strong
-      # @todo Temporary, expect to revert in 0.60
-      continue-on-error: true

.rubocop.yml

@@ -14,9 +14,7 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   NewCops: enable
   Exclude:
-    - "spec/fixtures/invalid_byte.rb"
-    - "spec/fixtures/invalid_node_comment.rb"
-    - "spec/fixtures/invalid_utf8.rb"
+    - "spec/fixtures/invalid_*.rb"
     - "spec/fixtures/gem-with-yard-macros/**/*"
     - "vendor/**/*"
     - "vendor/**/.*"
@@ -92,6 +90,12 @@ Metrics/PerceivedComplexity:
   Max: 40
 RSpec/ExampleLength:
   Max: 310
+# Autocorrect mangles short-style Hash tags with nested generics/parens
+# (e.g. Hash{Array(String, Array<String>) => String}) into invalid syntax.
+# Confirmed broken through rubocop-yard 1.3.0 (latest as of this writing),
+# against yard 0.9.45 (also latest as of this writing).
+YARD/CollectionStyle:
+  Enabled: false
 
 plugins:
   - rubocop-rspec