Update CI matrix and supported versions

rails · Jun 6, 2024 · 5f60c5d · 5f60c5d
1 parent 065cbe8
commit 5f60c5d
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 74 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,57 +8,31 @@ jobs:
       matrix:
         include:
           - ruby: 2.5
-            gemfile: "gemfiles/Gemfile.rails-5.2.x"
+            gemfile: "gemfiles/Gemfile.rails-6.1-sprockets-3"
           - ruby: 2.5
-            gemfile: "gemfiles/Gemfile.rails-5.2.x.sprockets-4.x"
-          - ruby: 2.5
-            gemfile: "gemfiles/Gemfile.rails-6.0.x"
-          - ruby: 2.5
-            gemfile: "gemfiles/Gemfile.rails-6.0.x.sprockets-4.x"
-          - ruby: 2.6
-            gemfile: "gemfiles/Gemfile.rails-5.2.x"
-          - ruby: 2.6
-            gemfile: "gemfiles/Gemfile.rails-5.2.x.sprockets-4.x"
-          - ruby: 2.6
-            gemfile: "gemfiles/Gemfile.rails-6.0.x"
-          - ruby: 2.6
-            gemfile: "gemfiles/Gemfile.rails-6.0.x.sprockets-4.x"
-          - ruby: 2.7
-            gemfile: "gemfiles/Gemfile.rails-5.2.x"
+            gemfile: "gemfiles/Gemfile.rails-6.1-sprockets-4"
+
           - ruby: 2.7
-            gemfile: "gemfiles/Gemfile.rails-5.2.x.sprockets-4.x"
+            gemfile: "gemfiles/Gemfile.rails-7.0-sprockets-3"
           - ruby: 2.7
-            gemfile: "gemfiles/Gemfile.rails-6.0.x"
+            gemfile: "gemfiles/Gemfile.rails-7.0-sprockets-4"
+
           - ruby: 2.7
-            gemfile: "gemfiles/Gemfile.rails-6.0.x.sprockets-4.x"
+            gemfile: "gemfiles/Gemfile.rails-7.1-sprockets-3"
           - ruby: 2.7
-            gemfile: "gemfiles/Gemfile.rails-6.1.x.sprockets-4.x"
-          - ruby: '3.0'
-            gemfile: "gemfiles/Gemfile.rails-6.0.x"
-          - ruby: '3.0'
-            gemfile: "gemfiles/Gemfile.rails-6.0.x.sprockets-4.x"
-          - ruby: '3.0'
-            gemfile: "gemfiles/Gemfile.rails-6.1.x.sprockets-4.x"
+            gemfile: "gemfiles/Gemfile.rails-7.1-sprockets-4"
+
           - ruby: 3.1
-            gemfile: "gemfiles/Gemfile.rails-6.0.x"
+            gemfile: "gemfiles/Gemfile.rails-7.2-sprockets-3"
           - ruby: 3.1
-            gemfile: "gemfiles/Gemfile.rails-6.0.x.sprockets-4.x"
+            gemfile: "gemfiles/Gemfile.rails-7.2-sprockets-4"
+
           - ruby: 3.1
-            gemfile: "gemfiles/Gemfile.rails-6.1.x.sprockets-4.x"
-          - ruby: 3.2
-            gemfile: "gemfiles/Gemfile.rails-6.0.x"
-          - ruby: 3.2
-            gemfile: "gemfiles/Gemfile.rails-6.0.x.sprockets-4.x"
-          - ruby: 3.2
-            gemfile: "gemfiles/Gemfile.rails-6.1.x.sprockets-4.x"
-          - ruby: 2.7
-            gemfile: Gemfile
-          - ruby: '3.0'
-            gemfile: Gemfile
-          - ruby: '3.1'
             gemfile: Gemfile
           - ruby: 3.2
             gemfile: Gemfile
+          - ruby: 3.3
+            gemfile: Gemfile
           - ruby: head
             gemfile: Gemfile
 

diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec
 
 gem 'actionpack', github: 'rails/rails', branch: 'main'

diff --git a/gemfiles/Gemfile.rails-5.2.x b/gemfiles/Gemfile.rails-5.2.x
diff --git a/gemfiles/Gemfile.rails-5.2.x.sprockets-4.x b/gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
diff --git a/gemfiles/Gemfile.rails-6.0.x b/gemfiles/Gemfile.rails-6.0.x
diff --git a/gemfiles/Gemfile.rails-6.0.x.sprockets-4.x b/gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
diff --git a/gemfiles/Gemfile.rails-6.1.x.sprockets-4.x → gemfiles/Gemfile.rails-6.1-sprockets-3 b/gemfiles/Gemfile.rails-6.1.x.sprockets-4.x → gemfiles/Gemfile.rails-6.1-sprockets-3
@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec path: '..'
 
 gem 'actionpack', '~> 6.1.0'
 gem 'railties', '~> 6.1.0'
-gem 'sprockets', '~> 4.0.0'
+gem 'sprockets', '~> 3.0'
diff --git a/gemfiles/Gemfile.rails-6.1-sprockets-4 b/gemfiles/Gemfile.rails-6.1-sprockets-4
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'actionpack', '~> 6.1.0'
+gem 'railties', '~> 6.1.0'
+gem 'sprockets', '~> 4.0'
diff --git a/gemfiles/Gemfile.rails-7.0-sprockets-3 b/gemfiles/Gemfile.rails-7.0-sprockets-3
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'actionpack', '~> 7.0.0'
+gem 'railties', '~> 7.0.0'
+gem 'sprockets', '~> 3.0'
diff --git a/gemfiles/Gemfile.rails-7.0-sprockets-4 b/gemfiles/Gemfile.rails-7.0-sprockets-4
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'actionpack', '~> 7.0.0'
+gem 'railties', '~> 7.0.0'
+gem 'sprockets', '~> 4.0'
diff --git a/gemfiles/Gemfile.rails-7.1-sprockets-3 b/gemfiles/Gemfile.rails-7.1-sprockets-3
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'actionpack', '~> 7.1.0'
+gem 'railties', '~> 7.1.0'
+gem 'sprockets', '~> 3.0'
diff --git a/gemfiles/Gemfile.rails-7.1-sprockets-4 b/gemfiles/Gemfile.rails-7.1-sprockets-4
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'actionpack', '~> 7.1.0'
+gem 'railties', '~> 7.1.0'
+gem 'sprockets', '~> 4.0'
diff --git a/gemfiles/Gemfile.rails-7.2-sprockets-3 b/gemfiles/Gemfile.rails-7.2-sprockets-3
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'actionpack', '~> 7.2.0.beta2'
+gem 'railties', '~> 7.2.0.beta2'
+gem 'sprockets', '~> 3.0'
diff --git a/gemfiles/Gemfile.rails-7.2-sprockets-4 b/gemfiles/Gemfile.rails-7.2-sprockets-4
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'actionpack', '~> 7.2.0.beta2'
+gem 'railties', '~> 7.2.0.beta2'
+gem 'sprockets', '~> 4.0'
diff --git a/sprockets-rails.gemspec b/sprockets-rails.gemspec
@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.5'
 
   s.add_dependency "sprockets", ">= 3.0.0"
-  s.add_dependency "actionpack", ">= 5.2"
-  s.add_dependency "activesupport", ">= 5.2"
-  s.add_development_dependency "railties", ">= 5.2"
+  s.add_dependency "actionpack", ">= 6.1"
+  s.add_dependency "activesupport", ">= 6.1"
+  s.add_development_dependency "railties", ">= 6.1"
   s.add_development_dependency "rake"
   s.add_development_dependency "sass"
   s.add_development_dependency "uglifier"