Skip to content

Commit

Permalink
Official Rails 7.2.0 Support (#155)
Browse files Browse the repository at this point in the history
  • Loading branch information
jturkel authored Aug 15, 2024
1 parent 216fe01 commit 5b345df
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 17 deletions.
9 changes: 2 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@ jobs:
- checkout
- unless:
condition:
or:
- equal: ["gemfiles/rails_7.2.gemfile", << parameters.gemfile >>]
- equal: ["gemfiles/rails_edge.gemfile", << parameters.gemfile >>]
equal: ["gemfiles/rails_edge.gemfile", << parameters.gemfile >>]
steps:
- restore_cache:
keys:
Expand All @@ -58,9 +56,7 @@ jobs:
fi
- unless:
condition:
or:
- equal: [ "gemfiles/rails_7.2.gemfile", << parameters.gemfile >> ]
- equal: [ "gemfiles/rails_edge.gemfile", << parameters.gemfile >> ]
equal: [ "gemfiles/rails_edge.gemfile", << parameters.gemfile >> ]
steps:
- save_cache:
key: v1-gems-ruby-<< parameters.ruby_version >>-{{ checksum "goldiloader.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
Expand Down Expand Up @@ -109,7 +105,6 @@ workflows:
matrix:
parameters:
gemfile:
- gemfiles/rails_7.2.gemfile
- gemfiles/rails_edge.gemfile
ruby_version:
- 3.3.4
7 changes: 3 additions & 4 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ appraise 'rails-7.1' do
end

appraise 'rails-7.2' do
# TODO: Update to 7.2.0 once it's released
gem 'activerecord', github: 'rails/rails', branch: '7-2-stable'
gem 'activesupport', github: 'rails/rails', branch: '7-2-stable'
gem 'rails', github: 'rails/rails', branch: '7-2-stable'
gem 'activerecord', '7.2.0'
gem 'activesupport', '7.2.0'
gem 'rails', '7.2.0'
end

appraise 'rails-edge' do
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 5.3.0
- Add support for Rails 7.2.

## 5.2.2
- Fix [issue 140](https://github.com/salsify/goldiloader/issues/140) - Defer referencing ActiveRecord classes until
it's been initialized to ensure the `Rails.application.config.filter_parameters` setting is applied properly.
Expand Down
6 changes: 3 additions & 3 deletions gemfiles/rails_7.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

source "https://rubygems.org"

gem "activerecord", branch: "7-2-stable", git: "https://github.com/rails/rails.git"
gem "activesupport", branch: "7-2-stable", git: "https://github.com/rails/rails.git"
gem "rails", branch: "7-2-stable", git: "https://github.com/rails/rails.git"
gem "activerecord", "7.2.0"
gem "activesupport", "7.2.0"
gem "rails", "7.2.0"

gemspec path: "../"
4 changes: 2 additions & 2 deletions goldiloader.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ Gem::Specification.new do |spec|

spec.required_ruby_version = '>= 3.0'

spec.add_dependency 'activerecord', '>= 6.1', '< 8.1'
spec.add_dependency 'activesupport', '>= 6.1', '< 8.1'
spec.add_dependency 'activerecord', '>= 6.1', '< 8'
spec.add_dependency 'activesupport', '>= 6.1', '< 8'

spec.add_development_dependency 'appraisal'
spec.add_development_dependency 'benchmark-ips'
Expand Down
2 changes: 1 addition & 1 deletion lib/goldiloader/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module Goldiloader
VERSION = '5.2.2'
VERSION = '5.3.0'
end

0 comments on commit 5b345df

Please sign in to comment.