Bump 'rdoc' dependency, handle 'erb' version constraint with Ruby 3.1 and improve CI bundle cache (#3185)

* Cache dependencies using ruby/setup-ruby

To speed our CI a bit, let's cache the dependencies.
I am using the recommended cache strategy for Ruby:
https://github.com/actions/cache/blob/main/examples.md#ruby---bundler

Additionally, to use the `--without` configuration, we need
to explicitely set the configuration keys through the environment:
https://bundler.io/man/bundle-config.1.html#CONFIGURATION-KEYS

* Bump 'rdoc' version and handle 'erb' while Ruby 3.1 is still supported

After changing CI to use ruby/setup-ruby cache,
CI fails for Ruby 3.1 because 'erbv 6.0' is not compatible
with that ruby version.
Although RUby 3.1 is EOL, we will support it until
Ruby 3.2 becomes EOL.

Author: stefannibrasil

.github/workflows/bench.yml

@@ -19,9 +19,8 @@ jobs:
     - uses: actions/checkout@v6
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.4'
-    - name: Install dependencies
-      run: bundle install
+        ruby-version: '4.0'
+        bundler-cache: true
 
     - name: Generators
       run: RUBYOPT="-W0" bundle exec ruby benchmark/generators.rb

.github/workflows/ruby.yml

@@ -22,20 +22,22 @@ jobs:
   lint:
     name: RuboCop
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_WITHOUT: benchmark
     steps:
       - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.4'
-
-      - name: Install dependencies
-        run: bundle install
+          ruby-version: '4.0'
+          bundler-cache: true
 
       - name: Run RuboCop
         run: bundle exec rake rubocop
   test:
     name: Ruby ${{ matrix.ruby }}
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_WITHOUT: benchmark
     strategy:
       fail-fast: false # don't fail all matrix builds if one fails
       matrix:
@@ -53,11 +55,7 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-
-    - name: Install dependencies
-      run: |
-        bundle config --without benchmark
-        bundle install
+        bundler-cache: true
 
     - name: Run tests
       run: bundle exec rake test

Gemfile

@@ -18,6 +18,9 @@ gem 'test-unit', '3.7.7'
 gem 'timecop', '0.9.10'
 gem 'yard', '0.9.38'
 
+# TODO: remove when Ruby 3.1 is no longer supported
+gem 'erb', '~> 4.0.4'
+
 group :benchmark do
   gem 'benchmark'
   gem 'benchmark-ips'

Gemfile.lock

@@ -10,11 +10,13 @@ GEM
     ast (2.4.3)
     benchmark (0.5.0)
     benchmark-ips (2.14.0)
+    cgi (0.5.1)
     coderay (1.1.3)
     concurrent-ruby (1.3.6)
     date (3.5.1)
     docile (1.4.1)
-    erb (6.0.1)
+    erb (4.0.4)
+      cgi (>= 0.3.3)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     io-console (0.8.2)
@@ -46,7 +48,7 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.1)
-    rdoc (7.0.3)
+    rdoc (7.1.0)
       erb
       psych (>= 4.0.0)
       tsort
@@ -92,12 +94,13 @@ GEM
     yard (0.9.38)
 
 PLATFORMS
-  arm64-darwin-22
+  arm64-darwin
   x86_64-linux
 
 DEPENDENCIES
   benchmark
   benchmark-ips
+  erb (~> 4.0.4)
   faker!
   irb
   minitest (= 5.27.0)