Gemfileを全体的に見直しつつRails7.2も追加した

willnet · Oct 24, 2024 · 2af749b · 2af749b
1 parent 4fe2df2
commit 2af749b
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 180 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,44 +14,28 @@ jobs:
           - 'false'
         ruby: ['2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
         include:
-          - ruby: '2.2'
-            gemfile: './test/rails_5.0.gemfile'
-          - ruby: '2.3'
-            gemfile: './test/rails_5.0.gemfile'
-          - ruby: '2.2'
-            gemfile: './test/rails_5.1.gemfile'
-          - ruby: '2.3'
-            gemfile: './test/rails_5.1.gemfile'
-          - ruby: '2.4'
-            gemfile: './test/rails_5.1.gemfile'
-          - ruby: '2.5'
-            gemfile: './test/rails_6.0.gemfile'
-          - ruby: '2.6'
-            gemfile: './test/rails_6.0.gemfile'
-          - ruby: '2.5'
-            gemfile: './test/rails_6.1.gemfile'
-          - ruby: '2.6'
-            gemfile: './test/rails_6.1.gemfile'
-          - ruby: '2.7'
-            gemfile: './test/rails_6.1.gemfile'
-          - ruby: '3.0'
-            gemfile: './test/rails_6.1.gemfile'
-          - ruby: '2.7'
-            gemfile: './test/rails_7.0.gemfile'
-          - ruby: '3.0'
-            gemfile: './test/rails_7.0.gemfile'
-          - ruby: '3.1'
-            gemfile: './test/rails_7.0.gemfile'
-          - ruby: '2.7'
-            gemfile: './test/rails_7.1.gemfile'
-          - ruby: '3.0'
-            gemfile: './test/rails_7.1.gemfile'
-          - ruby: '3.1'
-            gemfile: './test/rails_7.1.gemfile'
-          - ruby: '3.2'
-            gemfile: './test/rails_7.1.gemfile'
-          - ruby: '3.3'
-            gemfile: './test/rails_7.1.gemfile'
+          - { ruby: '2.2', gemfile: './test/rails_5.0.gemfile' }
+          - { ruby: '2.3', gemfile: './test/rails_5.0.gemfile' }
+          - { ruby: '2.2', gemfile: './test/rails_5.1.gemfile' }
+          - { ruby: '2.3', gemfile: './test/rails_5.1.gemfile' }
+          - { ruby: '2.4', gemfile: './test/rails_5.1.gemfile' }
+          - { ruby: '2.5', gemfile: './test/rails_6.0.gemfile' }
+          - { ruby: '2.6', gemfile: './test/rails_6.0.gemfile' }
+          - { ruby: '2.5', gemfile: './test/rails_6.1.gemfile' }
+          - { ruby: '2.6', gemfile: './test/rails_6.1.gemfile' }
+          - { ruby: '2.7', gemfile: './test/rails_6.1.gemfile' }
+          - { ruby: '3.0', gemfile: './test/rails_6.1.gemfile' }
+          - { ruby: '2.7', gemfile: './test/rails_7.0.gemfile' }
+          - { ruby: '3.0', gemfile: './test/rails_7.0.gemfile' }
+          - { ruby: '3.1', gemfile: './test/rails_7.0.gemfile' }
+          - { ruby: '2.7', gemfile: './test/rails_7.1.gemfile' }
+          - { ruby: '3.0', gemfile: './test/rails_7.1.gemfile' }
+          - { ruby: '3.1', gemfile: './test/rails_7.1.gemfile' }
+          - { ruby: '3.2', gemfile: './test/rails_7.1.gemfile' }
+          - { ruby: '3.3', gemfile: './test/rails_7.1.gemfile' }
+          - { ruby: '3.1', gemfile: './test/rails_7.2.gemfile' }
+          - { ruby: '3.2', gemfile: './test/rails_7.2.gemfile' }
+          - { ruby: '3.3', gemfile: './test/rails_7.2.gemfile' }
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
       MIDDLEWARE: ${{ matrix.middleware }}

diff --git a/test/rails_5.0.gemfile b/test/rails_5.0.gemfile
@@ -4,24 +4,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 5.0.0'
 gem 'rake', '>= 0.8.7'
+gem 'sqlite3', "~> 1.3.7"
 
-gem 'listen', '<3.1.2' # REQUIRED
 
-group :development, :test do
-  if defined?(JRUBY_VERSION)
-    gem 'jruby-openssl'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  else
-    gem 'sqlite3', "~> 1.3.7"
-  end
-  gem 'shoulda'
-end
-
-# redis based checks
-gem 'sidekiq', '~> 5.2.9', require: !ENV['SIDEKIQ'].nil? # REQUIRED
-gem 'redis', '~> 4.0.3', require: !ENV['REDIS_URL'].nil? # REQUIRED
-gem 'resque', '~> 1.27.4', require: !ENV['RESQUE'].nil? # REQUIRED
-gem 'elasticsearch', '~> 6.3.1', require: !ENV['ELASTICSEARCH_URL'].nil? # REQUIRED
-# s3 check
-gem 'aws-sdk-s3', require: !ENV['AWS_ACCESS_KEY_ID'].nil? # REQUIRED
 
diff --git a/test/rails_5.1.gemfile b/test/rails_5.1.gemfile
@@ -2,33 +2,6 @@
 
 source 'https://rubygems.org'
 
-ruby RUBY_VERSION < '2.2.2' ? '2.2.2' : RUBY_VERSION
-
 gem 'rails', '~> 5.1.0'
 gem 'rake', '>= 0.8.7'
-
-#  spring-watcher-listen was resolved to 2.0.1, which depends on
-#    listen was resolved to 3.1.5, which depends on
-#      ruby_dep
-#      and ruby_dep 1.5 requires 2.2.3 or later
-gem 'ruby_dep', '~> 1.3.0'  # REQUIRED
-
-gem 'listen', '<3.1.2' # REQUIRED
-
-group :development, :test do
-  if defined?(JRUBY_VERSION)
-    gem 'jruby-openssl'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  else
-    gem 'sqlite3', "~> 1.3.7"
-  end
-  gem 'shoulda'
-end
-
-# redis based checks
-gem 'sidekiq', '~> 5.2.9', require: !ENV['SIDEKIQ'].nil? # REQUIRED
-gem 'redis', '~> 4.0.3', require: !ENV['REDIS_URL'].nil? # REQUIRED
-gem 'resque', '~> 1.27.4', require: !ENV['RESQUE'].nil? # REQUIRED
-gem 'elasticsearch', '~> 6.3.1', require: !ENV['ELASTICSEARCH_URL'].nil? # REQUIRED
-# s3 check
-gem 'aws-sdk', require: !ENV['AWS_ACCESS_KEY_ID'].nil? # REQUIRED
+gem 'sqlite3', "~> 1.3.7"
diff --git a/test/rails_5.2.gemfile b/test/rails_5.2.gemfile
@@ -2,33 +2,6 @@
 
 source 'https://rubygems.org'
 
-ruby RUBY_VERSION < '2.2.2' ? '2.2.2' : RUBY_VERSION
-
 gem 'rails', '~> 5.2.0'
 gem 'rake', '>= 0.8.7'
-
-#  spring-watcher-listen was resolved to 2.0.1, which depends on
-#    listen was resolved to 3.1.5, which depends on
-#      ruby_dep
-#      and ruby_dep 1.5 requires 2.2.3 or later
-gem 'ruby_dep', '~> 1.3.0'  # REQUIRED
-
-gem 'listen', '<3.1.2' # REQUIRED
-
-group :development, :test do
-  if defined?(JRUBY_VERSION)
-    gem 'jruby-openssl'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  else
-    gem 'sqlite3', "~> 1.3.7"
-  end
-  gem 'shoulda'
-end
-
-# redis based checks
-gem 'sidekiq', '~> 5.2.9', require: !ENV['SIDEKIQ'].nil? # REQUIRED
-gem 'redis', '~> 4.0.3', require: !ENV['REDIS_URL'].nil? # REQUIRED
-gem 'resque', '~> 1.27.4', require: !ENV['RESQUE'].nil? # REQUIRED
-gem 'elasticsearch', '~> 6.3.1', require: !ENV['ELASTICSEARCH_URL'].nil? # REQUIRED
-# s3 check
-gem 'aws-sdk', require: !ENV['AWS_ACCESS_KEY_ID'].nil? # REQUIRED
+gem 'sqlite3', "~> 1.3.7"
diff --git a/test/rails_6.0.gemfile b/test/rails_6.0.gemfile
@@ -2,29 +2,6 @@
 
 source 'https://rubygems.org'
 
-ruby RUBY_VERSION < '2.5' ? '2.5.0' : RUBY_VERSION
-
 gem 'rails', '~> 6.0.0'
 gem 'rake', '>= 0.8.7'
-
-gem 'listen', '<3.1.2' # REQUIRED
-
-group :development, :test do
-  if defined?(JRUBY_VERSION)
-    gem 'jruby-openssl'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  else
-    gem 'sqlite3', "~> 1.3.7"
-  end
-  gem 'shoulda'
-end
-
-# redis based checks
-gem 'sidekiq', '~> 5.2.9', require: !ENV['SIDEKIQ'].nil? # REQUIRED
-gem 'redis', '~> 4.0.3', require: !ENV['REDIS_URL'].nil? # REQUIRED
-gem 'resque', '~> 1.27.4', require: !ENV['RESQUE'].nil? # REQUIRED
-gem 'elasticsearch', '~> 6.3.1', require: !ENV['ELASTICSEARCH_URL'].nil? # REQUIRED
-# s3 check
-gem 'aws-sdk-s3', require: !ENV['AWS_ACCESS_KEY_ID'].nil? # REQUIRED
-
-gem 'webpacker', '~> 4.0.7' # REQUIRED
+gem 'sqlite3', "~> 1.3.7"
diff --git a/test/rails_6.1.gemfile b/test/rails_6.1.gemfile
@@ -2,28 +2,6 @@
 
 source 'https://rubygems.org'
 
-ruby RUBY_VERSION < '2.5' ? '2.5.0' : RUBY_VERSION
-
 gem 'rails', '~> 6.1.0'
 gem 'rake', '>= 0.8.7'
-
-group :development, :test do
-  if defined?(JRUBY_VERSION)
-    gem 'jruby-openssl'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  else
-    gem 'sqlite3', "~> 1.3.7"
-  end
-  gem 'shoulda'
-end
-
-# redis based checks
-gem 'sidekiq', require: !ENV['SIDEKIQ'].nil? # REQUIRED
-gem 'redis', require: !ENV['REDIS_URL'].nil? # REQUIRED
-gem 'resque', require: !ENV['RESQUE'].nil? # REQUIRED
-# s3 check
-gem 'aws-sdk-s3', require: !ENV['AWS_ACCESS_KEY_ID'].nil? # REQUIRED
-
-gem 'webpacker', '~> 4.0.7' # REQUIRED
-gem 'rexml', '~> 3.2.4' # REQUIRED for ruby 3.0
-gem 'webrick' # REQUIRED for ruby 3.0
+gem 'sqlite3', "~> 1.3.7"
diff --git a/test/rails_7.0.gemfile b/test/rails_7.0.gemfile
@@ -3,24 +3,4 @@
 source 'https://rubygems.org'
 
 gem 'rails', '~> 7.0.0'
-
-group :development, :test do
-  if defined?(JRUBY_VERSION)
-    gem 'jruby-openssl'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  else
-    gem 'sqlite3', "~> 1.4"
-  end
-  gem 'shoulda'
-end
-
-# redis based checks
-gem 'sidekiq', require: !ENV['SIDEKIQ'].nil? # REQUIRED
-gem 'redis', require: !ENV['REDIS_URL'].nil? # REQUIRED
-gem 'resque', require: !ENV['RESQUE'].nil? # REQUIRED
-gem 'elasticsearch', require: !ENV['ELASTICSEARCH_URL'].nil? # REQUIRED
-# s3 check
-gem 'aws-sdk-s3', require: !ENV['AWS_ACCESS_KEY_ID'].nil? # REQUIRED
-
-gem 'rexml' # REQUIRED for ruby >= 3.0
-gem 'webrick' # REQUIRED for ruby >= 3.0
+gem 'sqlite3', "~> 1.4"
diff --git a/test/rails_7.2.gemfile b/test/rails_7.2.gemfile
@@ -0,0 +1,8 @@
+# Gemfile for health_test testing
+
+source 'https://rubygems.org'
+
+gem 'rails', '~> 7.2.0'
+gem 'sqlite3', "~> 1.4"
+
+gemspec(path: '../')