Skip to content

Commit

Permalink
Merge pull request #222 from zombocom/ISSUE-217
Browse files Browse the repository at this point in the history
Add appraisal and rails 7 to test matrix [changelog skip]
  • Loading branch information
deepakmahakale authored Mar 6, 2023
2 parents d9f40e4 + 53cd933 commit b848978
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 18 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@ jobs:
- gemfiles/rails_5_2.gemfile
- gemfiles/rails_6_0.gemfile
- gemfiles/rails_6_1.gemfile
- gemfiles/rails_7_0.gemfile
- gemfiles/rails_head.gemfile
exclude:
- ruby: "2.5.8"
gemfile: gemfiles/rails_7_0.gemfile
- ruby: "2.5.8"
gemfile: gemfiles/rails_head.gemfile
- ruby: "2.7.2"
Expand Down Expand Up @@ -58,4 +61,4 @@ jobs:
git config --global user.email "user@example.com"
git config --global user.name "Github Action Bot"
- name: Run test
run: bundle exec rake test
run: bundle exec rake test
26 changes: 26 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# frozen_string_literal: true

appraise 'rails_5_1' do
gem 'rails', '~> 5.1.0'
end

appraise 'rails_5_2' do
gem 'rails', '~> 5.2.0'
end

appraise 'rails_6_0' do
gem 'rails', '~> 6.0.0'
end

appraise 'rails_6_1' do
gem 'rails', '~> 6.1.0'

# https://stackoverflow.com/questions/70500220/rails-7-ruby-3-1-loaderror-cannot-load-such-file-net-smtp
gem 'net-smtp', require: false
gem 'net-imap', require: false
gem 'net-pop', require: false
end

appraise 'rails_7_0' do
gem 'rails', '~> 7.0'
end
1 change: 1 addition & 0 deletions derailed_benchmarks.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Gem::Specification.new do |gem|
gem.add_dependency "dead_end", ">= 0"
gem.add_dependency "rack-test", ">= 0"

gem.add_development_dependency "appraisal"
gem.add_development_dependency "webrick", ">= 0"
gem.add_development_dependency "capybara", "~> 2"
gem.add_development_dependency "m"
Expand Down
6 changes: 1 addition & 5 deletions gemfiles/rails_5_1.gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
# frozen_string_literal: true

# BUNDLE_GEMFILE="gemfiles/rails_5_1.gemfile" bundle exec m test/integration/tasks_test.rb:30
#
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 5.1.7"
gem "rails", "~> 5.1.0"

group :development, :test do
gem "sqlite3", platform: [:ruby, :mswin, :mingw]
Expand Down
4 changes: 1 addition & 3 deletions gemfiles/rails_5_2.gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# This file was generated by Appraisal
#
# BUNDLE_GEMFILE="gemfiles/rails_5_2.gemfile" bundle exec m test/integration/tasks_test.rb:30

source "https://rubygems.org"

gem "rails", "~> 5.2.4.4"
gem "rails", "~> 5.2.0"

group :development, :test do
gem "sqlite3", platform: [:ruby, :mswin, :mingw]
Expand Down
4 changes: 1 addition & 3 deletions gemfiles/rails_6_0.gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "6.0.5"
gem "rails", "~> 6.0.0"

group :development, :test do
gem "sqlite3", platform: [:ruby, :mswin, :mingw]
Expand Down
10 changes: 4 additions & 6 deletions gemfiles/rails_6_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

source "https://rubygems.org"

gem "rails", "~> 6.1.1"

# https://stackoverflow.com/questions/70500220/rails-7-ruby-3-1-loaderror-cannot-load-such-file-net-smtp
gem 'net-smtp', require: false
gem 'net-imap', require: false
gem 'net-pop', require: false
gem "rails", "~> 6.1.0"
gem "net-smtp", require: false
gem "net-imap", require: false
gem "net-pop", require: false

group :development, :test do
gem "sqlite3", platform: [:ruby, :mswin, :mingw]
Expand Down
13 changes: 13 additions & 0 deletions gemfiles/rails_7_0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 7.0"

group :development, :test do
gem "sqlite3", platform: [:ruby, :mswin, :mingw]
gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", platform: :jruby
gem "test-unit", "~> 3.0"
end

gemspec path: "../"

0 comments on commit b848978

Please sign in to comment.