Skip to content

Commit

Permalink
Drop end of life rails < 7 and only support rubies 7 supports, 2.7+
Browse files Browse the repository at this point in the history
Drop ruby 2.5 and 2.6.
Drop rails 6.0 and 6.1.

Rails 7 is still supported and requires ruby 2.7 and higher so test with this minimal baseline.
  • Loading branch information
jrafanie committed Oct 7, 2024
1 parent 65d91f7 commit 00f3f40
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 20 deletions.
20 changes: 8 additions & 12 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,20 @@ jobs:
strategy:
matrix:
ruby-version:
- '2.5'
- '2.6'
- '2.7'
- '3.0'
- '3.1'
- '3.2'
- '3.3'
rails-version:
- '6.0'
- '6.1'
include:
- ruby-version: '3.1'
rails-version: '6.1'
# rails 7 requires ruby 2.7+
- '7.0'
- '7.1'
- '7.2'
exclude:
- ruby-version: '2.7'
rails-version: '7.0'
rails-version: '7.2'
- ruby-version: '3.0'
rails-version: '7.0'
- ruby-version: '3.1'
rails-version: '7.0'
rails-version: '7.2'
env:
TEST_RAILS_VERSION: "${{ matrix.rails-version }}"
CC_TEST_REPORTER_ID: "${{ secrets.CC_TEST_REPORTER_ID }}"
Expand Down
11 changes: 5 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ gemspec

minimum_version =
case ENV['TEST_RAILS_VERSION']
when "6.0"
"~>6.0.4"
when "7.0"
"~>7.0.8"
when "7.2"
"~>7.2.1"
when "7.1"
"~>7.1.4"
else
"~>6.1.4"
"~>7.0.8"
end

gem "activerecord", minimum_version

# sqlite3 doesn't bundle properly with Rails 7.0 or less.
Expand Down
4 changes: 2 additions & 2 deletions ovirt_metrics.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
spec.test_files += %w[.rspec]
spec.require_paths = ["lib"]

spec.required_ruby_version = ">= 2.5.8"
spec.required_ruby_version = ">= 2.7"

spec.add_dependency "activerecord", ">=6.0"
spec.add_dependency "activerecord", ">=7.0"
spec.add_dependency "pg"

spec.add_development_dependency "bundler"
Expand Down

0 comments on commit 00f3f40

Please sign in to comment.