Merge branch 'master' into 20240102-rubocop-github-actions

departurerb · Jan 2, 2024 · b35c464 · b35c464
2 parents 445c722 + b5f7cb6
commit b35c464
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,28 +8,53 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - 2.4
           - 2.5
           - 2.6
           - 2.7
+          - 3.0
+          - 3.1
+          - 3.2
+          - 3.3
         rails:
           - 5.2.0
           - 6.0.0
           - 6.1.0
+          - 7.0.1
           - 7.1.2
-        include:
+        exclude: # These Rails versions are too new for the respective Ruby versions, or vice-versa
+          - ruby: 2.4
+            rails: 6.0.0
           - ruby: 2.4
-            rails: 5.2.0
-          - ruby: 2.7
-            rails: 7.0.1
-          - ruby: 3.0
             rails: 6.1.0
-          - ruby: 3.0
+          - ruby: 2.4
+            rails: 7.0.1
+          - ruby: 2.4
             rails: 7.1.2
-        exclude:
+          - ruby: 2.5
+            rails: 7.0.1
           - ruby: 2.5
             rails: 7.1.2
+          - ruby: 2.6
+            rails: 7.0.1
           - ruby: 2.6
             rails: 7.1.2
+          - ruby: 3.0
+            rails: 5.2.0
+          - ruby: 3.0
+            rails: 6.0.0
+          - ruby: 3.1
+            rails: 5.2.0
+          - ruby: 3.1
+            rails: 6.0.0
+          - ruby: 3.2
+            rails: 5.2.0
+          - ruby: 3.2
+            rails: 6.0.0
+          - ruby: 3.3
+            rails: 5.2.0
+          - ruby: 3.3
+            rails: 6.0.0
     env:
       PERCONA_DB_USER: root
       PERCONA_DB_PASSWORD: root

diff --git a/departure.gemspec b/departure.gemspec
@@ -23,6 +23,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.4.0'
+
   spec.add_runtime_dependency 'railties', *Array(RAILS_DEPENDENCY_VERSION)
   spec.add_runtime_dependency 'activerecord', *Array(RAILS_DEPENDENCY_VERSION)
   spec.add_runtime_dependency 'mysql2', '>= 0.4.0', '<= 0.5.5'