Merge pull request #572 from Shopify/ian/bump-ruby-version

We noticed that Dependabot has stopped being able to issue updates due to the gemspec specifying Ruby 2.7+, but we have optional dependencies that require ruby 3.1+. While our .ruby-version file specifies 3.2, Dependabot only reads the gemspec and not the ruby-version file. This is a known bug (dependabot/dependabot-core#10108) that has not been addressed.

Looking at Ruby's deprecation schedule, 2.7 was EOL in 2023 and 3.1 will be EOL in a month. This gives us good reason to support 3.2+ going forward, bringing the gemspec in line with our testing versions.

This will necessitate a minor version bump to 0.23 to not surprise folks who have pinned to 0.22

In this, we also needed to bump dependencies so they would work with newer ruby versions. In this, we ran into gRPC tests not exiting despite passing, so a lot of defensiveness has been added to those tests to ensure that we're actually closing everything and cleaning up after ourselves. In addition, we noticed that when running tests locally with docker-compose, gRPC would return GRPC::Unavailable instead of GRPC::DeadlineExceeded

Bump gemspec to use Ruby 3.2+
Drop 2.7 and 3.0 from testing, add 3.3 and 3.4
Bump toxiproxy test container from 2.5.0 -> 2.12.0
Bump gRPC to 1.71.0
Bump trilogy to 2.9
Update lockfiles
Add timeouts in CI
Update rubocop to use plugins
Style fixes
Fix gRPC test to exit cleanly.

Author: iandelahorne

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=3.2.0
+ARG RUBY_VERSION=3.4.3
 FROM ruby:${RUBY_VERSION} as base
 
 # Avoid warnings by switching to noninteractive
@@ -15,7 +15,7 @@ RUN apt-get -o Acquire::Max-FutureTime=86400 update \
       linux-perf \
       lldb \
       lsb-release \
-      netcat \
+      netcat-openbsd \
       procps \
       xz-utils \
  && gem install bundler rcodetools rubocop ruby-debug-ide fastri

.devcontainer/docker-compose.yml

@@ -45,7 +45,7 @@ services:
       - test
 
   toxiproxy:
-    image: ghcr.io/shopify/toxiproxy:2.5.0
+    image: ghcr.io/shopify/toxiproxy:2.12.0
     container_name: toxiproxy
     depends_on:
       - redis

.github/workflows/test.yml

@@ -32,10 +32,9 @@ jobs:
       fail-fast: true
       matrix:
         ruby:
+          - "3.4"
+          - "3.3"
           - "3.2"
-          - "3.1"
-          - "3.0"
-          - "2.7"
     services:
       mysql:
         image: mysql:5.7
@@ -54,7 +53,7 @@ jobs:
           --health-timeout=5s
           --health-retries=5
       toxiproxy:
-        image: ghcr.io/shopify/toxiproxy:2.5.0
+        image: ghcr.io/shopify/toxiproxy:2.12.0
     steps:
       -
         name: Checkout
@@ -77,6 +76,7 @@ jobs:
         run: bundle exec rake build
       -
         name: Tests
+        timeout-minutes: 5
         run: |
           bundle exec rake test:semian ||
           (echo "===== Retry Attempt: 2 ====" && bundle exec rake test:semian) || \
@@ -109,10 +109,9 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - "3.4"
+          - "3.3"
           - "3.2"
-          - "3.1"
-          - "3.0"
-          - "2.7"
         gemfile:
           - grpc
           - mysql2
@@ -160,7 +159,7 @@ jobs:
           --health-timeout=5s
           --health-retries=5
       toxiproxy:
-        image: ghcr.io/shopify/toxiproxy:2.5.0
+        image: ghcr.io/shopify/toxiproxy:2.12.0
     steps:
       -
         name: Checkout
@@ -185,6 +184,7 @@ jobs:
           bundle exec rake build
       -
         name: Tests
+        timeout-minutes: 5
         env:
           TEST: test/adapters/${{ matrix.adapter }}_test.rb
         run: |

.rubocop.yml

@@ -1,6 +1,5 @@
 ---
-
-require:
+plugins:
   - rubocop-minitest
   - rubocop-rake
   - rubocop-thread_safety

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.4.3

Gemfile

@@ -15,10 +15,11 @@ group :test do
   gem "toxiproxy"
   gem "webrick"
 
-  # The last stable version for MacOS ARM darwin
-  gem "grpc", "1.60.0"
+  gem "bigdecimal"
+  gem "mutex_m"
+  gem "grpc", "1.71.0"
   gem "mysql2", "~> 0.5"
-  gem "trilogy", "~> 2.8"
+  gem "trilogy", "~> 2.9"
   gem "activerecord", github: "rails/rails", branch: "main"
   gem "hiredis", "~> 0.6"
   # NOTE: v0.12.0 required for ruby 3.2.0. https://github.com/redis-rb/redis-client/issues/58

Gemfile.lock

@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=3.2.0
+ARG RUBY_VERSION=3.4.3
 FROM ruby:${RUBY_VERSION} as base
 
 # Avoid warnings by switching to noninteractive