Rejig a bunch of the Ruby handling in CI [Was: Bump rubocop from 1.62.1 to 1.63.0]

.github/workflows/build_site.yml

@@ -31,6 +31,8 @@ jobs:
   build:
     name: Build the website
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_WITH: build
     steps:
       - name: "Check out the repo"
         uses: actions/checkout@v4

.github/workflows/merge_pull_request.yml

@@ -9,12 +9,12 @@ jobs:
   build:
     name: Merge pull request
     runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'alexwlchan' && !github.event.pull_request.draft
     steps:
       - name: "Check out the repo"
         uses: actions/checkout@v4
 
       - name: Merge the pull request
-        if: github.event.pull_request.user.login == 'alexwlchan' && !github.event.pull_request.draft
         run: |
           python3 -m pip install httpx
           python3 .github/workflows/merge_pull_request.py

.github/workflows/rubocop.yml

@@ -7,18 +7,26 @@ on:
 
     paths:
       - '**/*.rb'
+      - '.github/workflows/rubocop.yml'
+      - 'Gemfile'
+      - 'Gemfile.lock'
 
   pull_request:
     branches:
     - main
 
     paths:
       - '**/*.rb'
+      - '.github/workflows/rubocop.yml'
+      - 'Gemfile'
+      - 'Gemfile.lock'
 
 jobs:
   build:
     name: Lint the Ruby code
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_WITH: lint
     steps:
       - name: "Check out the repo"
         uses: actions/checkout@v4
@@ -27,8 +35,8 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.3"
+          bundler-cache: true
+          cache-version: 0
 
       - name: Run rubocop
-        run: |
-          gem install rubocop -v 1.62.1
-          rubocop
+        run: bundle exec rubocop

.github/workflows/run_plugin_tests.yml

@@ -7,18 +7,24 @@ on:
 
     paths:
       - 'src/_plugins/**'
+      - 'Gemfile'
+      - 'Gemfile.lock'
 
   pull_request:
     branches:
     - main
 
     paths:
       - 'src/_plugins/**'
+      - 'Gemfile'
+      - 'Gemfile.lock'
 
 jobs:
   build:
     name: Run plugin tests
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_WITH: build:test
     steps:
       - name: "Check out the repo"
         uses: actions/checkout@v4

.gitignore

@@ -3,5 +3,5 @@
 .sass-cache
 _site
 *.pyc
-
+.bundle
 .DS_Store

.rubocop.yml

@@ -1,13 +1,18 @@
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.3
 
   Exclude:
     - '_site/**/*'
     - 'src/_files/2022/division1.rb'
     - 'src/_files/2022/division2.rb'
     - 'src/_files/2023/uequals_operator.rb'
 
+    # This is to avoid RuboCop trying to lint too much stuff when running
+    # in GitHub Actions.
+    # See https://stackoverflow.com/a/69421161/1558022
+    - 'vendor/**/*'
+
 Layout/LineLength:
   Max: 200
 

Gemfile

@@ -1,11 +1,20 @@
 source 'https://rubygems.org'
 
-gem 'chunky_png', '~> 1.4'
-gem 'color', '~> 1.8'
-gem 'html-proofer', '~> 5'
-gem 'jekyll', '~> 4'
-gem 'jekyll-include-cache', '~> 0.2'
-gem 'json-schema', '~> 4'
-gem 'nokogiri', '~> 1.16'
-gem 'rubocop', '~> 1.62'
-gem 'shell-executer', '~> 1.0'
+group :build, optional: true do
+  gem 'chunky_png', '~> 1.4'
+  gem 'color', '~> 1.8'
+  gem 'html-proofer', '~> 5'
+  gem 'jekyll', '~> 4'
+  gem 'jekyll-include-cache', '~> 0.2'
+  gem 'json-schema', '~> 4'
+  gem 'nokogiri', '~> 1.16'
+  gem 'shell-executer', '~> 1.0'
+end
+
+group :lint, optional: true do
+  gem 'rubocop', '~> 1.63'
+end
+
+group :test, optional: true do
+  gem 'test-unit'
+end

Gemfile.lock

@@ -102,6 +102,7 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
+    power_assert (2.0.3)
     public_suffix (5.0.5)
     racc (1.7.3)
     rainbow (3.1.1)
@@ -112,7 +113,7 @@ GEM
     regexp_parser (2.9.0)
     rexml (3.2.6)
     rouge (4.2.1)
-    rubocop (1.62.1)
+    rubocop (1.63.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -137,6 +138,8 @@ GEM
       open4
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
+    test-unit (3.6.2)
+      power_assert
     timers (4.3.5)
     ttfunk (1.8.0)
       bigdecimal (~> 3.1)
@@ -158,8 +161,9 @@ DEPENDENCIES
   jekyll-include-cache (~> 0.2)
   json-schema (~> 4)
   nokogiri (~> 1.16)
-  rubocop (~> 1.62)
+  rubocop (~> 1.63)
   shell-executer (~> 1.0)
+  test-unit
 
 BUNDLED WITH
    2.3.26

scripts/linter.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'set'
-
 require 'html-proofer'
 require 'json'
 require 'json-schema'

scripts/save_elsewhere_article.rb

@@ -17,7 +17,6 @@
 # [2]: https://www.stephaniemorillo.co/post/why-developers-should-archive-their-old-content
 
 require 'fileutils'
-require 'set'
 require 'yaml'
 
 require 'unidecode'