Merge pull request #153 from rails/rm-drop-unsupported-rails

Drop support to Rails < 6.1 and unsupported Ruby versions
rails · Jan 25, 2023 · 954ed95 · 954ed95
2 parents 10673ef + f471fd5
commit 954ed95
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 64 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,45 +6,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.5, 2.6, 2.7 ]
-        rails: [ '5.0', '5.1', '5.2', '6.0', '6.1' ]
+        ruby: [ '2.7', '3.0', '3.1', 'head', 'truffleruby' ]
+        rails: [ '6.1', '7.0', 'main' ]
         include:
-          - ruby: '2.7'
-            rails: '7.0'
-          - ruby: '2.7'
-            rails: 'main'
-          - ruby: '3.0'
-            rails: '6.0'
-          - ruby: '3.0'
-            rails: '6.1'
-          - ruby: '3.0'
-            rails: '7.0'
-          - ruby: '3.0'
-            rails: 'main'
-          - ruby: '3.1'
-            rails: '6.1'
-          - ruby: '3.1'
-            rails: '7.0'
-          - ruby: '3.1'
-            rails: 'main'
           - ruby: '3.2'
             rails: '7.0'
           - ruby: '3.2'
             rails: 'main'
-          - ruby: head
-            rails: '6.0'
-          - ruby: head
-            rails: '6.1'
-          - ruby: head
-            rails: 'main'
-          - ruby: truffleruby
-            rails: '6.0'
-          - ruby: truffleruby
-            rails: '6.1'
-          - ruby: truffleruby
-            rails: '7.0'
-          - ruby: truffleruby
-            rails: 'main'
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails }}.gemfile

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     globalid (1.1.0)
-      activesupport (>= 5.0)
+      activesupport (>= 6.1)
 
 GEM
   remote: https://rubygems.org/

diff --git a/Rakefile b/Rakefile
@@ -5,9 +5,7 @@ task :default => :test
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
-  t.test_files = FileList.new('test/cases/**/*_test.rb') do |fl|
-    fl.exclude('test/cases/pattern_matching_test.rb') if RUBY_VERSION < '2.7'
-  end
+  t.test_files = FileList['test/cases/**/*_test.rb']
   t.verbose = true
   t.warning = true
 end
diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile
diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
diff --git a/globalid.gemspec b/globalid.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files        = Dir['MIT-LICENSE', 'README.md', 'lib/**/*']
   s.require_path = 'lib'
 
-  s.add_runtime_dependency 'activesupport', '>= 5.0'
+  s.add_runtime_dependency 'activesupport', '>= 6.1'
 
   s.add_development_dependency 'rake'