Skip to content

Commit

Permalink
Drop 7.1 files / identifiers from the master branch
Browse files Browse the repository at this point in the history
Best I can tell, the intent is to keep ONE version on master or
versioned branch but for some reason 7.1 added a 7.2.beta and kept it
around for a bit. I think this brings it back to the original intent.

Long term: nuke the gemfiles directory. Remove gemfiles from the CI
matrix. Unify.
  • Loading branch information
zenspider committed Dec 18, 2024
1 parent fb35e48 commit 97ef67e
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 24 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,11 @@ jobs:
fail-fast: false
matrix:
ruby:
- '2.7'
- '3.0'
- '3.1'
- '3.2'
- '3.3'
gemfile:
- gemfiles/rails-7.1.0.gemfile
- gemfiles/rails-7.2.0.gemfile
exclude:
- ruby: '2.7'
gemfile: gemfiles/rails-7.2.0.gemfile
- ruby: '3.0'
gemfile: gemfiles/rails-7.2.0.gemfile
env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}

Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.1
SuggestExtensions: false
NewCops: enable

Expand Down
12 changes: 0 additions & 12 deletions gemfiles/rails-7.1.0.gemfile

This file was deleted.

4 changes: 2 additions & 2 deletions minitest-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Gem::Specification.new do |gem|
["README.md", "UPDATING.md", "CHANGELOG.md", "LICENSE"]
gem.require_paths = ["lib"]

gem.required_ruby_version = ">= 2.7.0"
gem.required_ruby_version = ">= 3.1"

gem.add_dependency "minitest", "~> 5.20"
gem.add_dependency "railties", ">= 7.1.0", "< 8.0.0"
gem.add_dependency "railties", ">= 7.2.0", "< 8.0.0"

gem.add_development_dependency "minitest-autotest", "~> 1.1"
gem.add_development_dependency "minitest-focus", "~> 1.4"
Expand Down
2 changes: 1 addition & 1 deletion test/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Application < ::Rails::Application
config.secret_key_base = "abc123"
config.hosts << "www.example.com"
config.eager_load = false
config.load_defaults 7.1
config.load_defaults 7.2
end
end

Expand Down

0 comments on commit 97ef67e

Please sign in to comment.