Skip to content

Commit

Permalink
Merge pull request #208 from JoeSouthan/joesouthan-rails71
Browse files Browse the repository at this point in the history
Enable support for Rails 7.1
  • Loading branch information
jrochkind authored Oct 5, 2023
2 parents bd65183 + 481cabd commit dd38e14
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 1 deletion.
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,15 @@ jobs:

- gemfile: rails_7_0
ruby: 3.2

- gemfile: rails_7_1
ruby: '3.0'

- gemfile: rails_7_1
ruby: 3.1

- gemfile: rails_7_1
ruby: 3.2

name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}

Expand Down
7 changes: 7 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ appraise "rails-7-0" do
gem "pg", "~> 1.0"
end

appraise "rails-7-1" do
gem 'combustion', "~> 1.0"

gem "rails", "~> 7.1.0"
gem "pg", "~> 1.0"
end

appraise "rails-edge" do
# need combustion edge to work with rails edge, will no longer
# be true on next combustion release, probably no later than Rails 7.1
Expand Down
2 changes: 1 addition & 1 deletion attr_json.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ attributes use as much of the existing ActiveRecord architecture as we can.}
# dependency included just as it is here, should never be released
# from an env tht has any of these variables set.
unless ENV['APPRAISAL_INITIALIZED'] || ENV["TRAVIS"] || ENV['CI']
spec.add_runtime_dependency "activerecord", ">= 6.0.0", "< 7.1"
spec.add_runtime_dependency "activerecord", ">= 6.0.0", "< 7.2"
end

spec.add_development_dependency "bundler"
Expand Down
18 changes: 18 additions & 0 deletions gemfiles/rails_7_1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "combustion", "~> 1.0"
gem "rails", "~> 7.1.0"
gem "pg", "~> 1.0"
gem "rspec-rails", "~> 6.0"
gem "simple_form", ">= 4.0"
gem "cocoon", ">= 1.2"
gem "jquery-rails"
gem "coffee-rails"
gem "sprockets-rails"
gem "capybara", "~> 3.0"
gem "selenium-webdriver"
gem "byebug"

gemspec path: "../"

0 comments on commit dd38e14

Please sign in to comment.