Upgrade to Ruby 3.2

mysociety · Dec 17, 2024 · f40b378 · f40b378
1 parent e59df56
commit f40b378
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,9 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - { ruby: 2.7 }
-        - { ruby: 2.7, gemfile: 'gemfiles/rails_7.gemfile' }
-        - { ruby: 2.7, gemfile: 'gemfiles/rails_main.gemfile' }
+        - { ruby: 3.2 }
+        - { ruby: 3.2, gemfile: 'gemfiles/rails_7.gemfile' }
+        - { ruby: 3.2, gemfile: 'gemfiles/rails_main.gemfile' }
 
     services:
       postgres:

diff --git a/Gemfile b/Gemfile
@@ -56,6 +56,7 @@ gem 'omniauth-google-oauth2'
 gem 'omniauth-rails_csrf_protection'
 
 gem 'scenic'
+gem 'net-smtp', require: false
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -101,6 +101,10 @@ GEM
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (2.0.2)
     ffi (1.17.0)
+    ffi (1.17.0-aarch64-linux-gnu)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
     fugit (1.5.3)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
@@ -138,6 +142,7 @@ GEM
       activesupport (>= 5.0.0)
     json (2.5.1)
     jwt (2.2.3)
+    libv8-node (16.10.0.0)
     libv8-node (16.10.0.0-aarch64-linux)
     libv8-node (16.10.0.0-arm64-darwin)
     libv8-node (16.10.0.0-x86_64-darwin)
@@ -163,15 +168,15 @@ GEM
     msgpack (1.5.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
     netrc (0.11.0)
     nio4r (2.7.4)
     nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.6-aarch64-linux)
-      racc (~> 1.4)
-    nokogiri (1.13.6-x86_64-linux)
-      racc (~> 1.4)
     oauth2 (1.4.9)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
@@ -333,6 +338,7 @@ GEM
     thwait (0.2.0)
       e2mmap
     tilt (2.0.10)
+    timeout (0.4.3)
     ttfunk (1.7.0)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
@@ -375,6 +381,7 @@ DEPENDENCIES
   jbuilder (~> 2.11)
   listen (>= 3.0.5, < 3.8)
   mini_racer
+  net-smtp
   omniauth (~> 2.0.4)
   omniauth-google-oauth2
   omniauth-rails_csrf_protection

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7-bullseye
+FROM ruby:3.2-bullseye
 
 ENV DOCKER 1
 ENV DEBIAN_FRONTEND noninteractive

diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock
@@ -394,6 +394,7 @@ DEPENDENCIES
   jbuilder (~> 2.11)
   listen (>= 3.0.5, < 3.8)
   mini_racer
+  net-smtp
   omniauth (~> 2.0.4)
   omniauth-google-oauth2
   omniauth-rails_csrf_protection

diff --git a/gemfiles/rails_main.gemfile.lock b/gemfiles/rails_main.gemfile.lock
@@ -401,6 +401,7 @@ DEPENDENCIES
   jbuilder (~> 2.11)
   listen (>= 3.0.5, < 3.8)
   mini_racer
+  net-smtp
   omniauth (~> 2.0.4)
   omniauth-google-oauth2
   omniauth-rails_csrf_protection

diff --git a/spec/services/generate_foi_suggestion_spec.rb b/spec/services/generate_foi_suggestion_spec.rb
@@ -9,8 +9,8 @@ def suggest_all(body = nil, request: nil)
       described_class.from_request(request)
     end
 
-    def suggest(*args)
-      suggest_all(*args).first
+    def suggest(*args, **kwargs)
+      suggest_all(*args, **kwargs).first
     end
 
     context 'resources with keywords' do