Skip to content

Commit

Permalink
Update CI and gemfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
mullermp committed Nov 13, 2024
1 parent cfaa9d8 commit af53983
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 53 deletions.
17 changes: 12 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,30 @@ jobs:
fail-fast: false
matrix:
ruby: [2.7, '3.0', 3.1, 3.2, 3.3, jruby-9.4]
rails: [7.1, 7.2, main]
rails: [7.1, 7.2, '8.0', main]

exclude:
# Rails 7.2 dropped support for older rubygems
# Rails 7.2 is Ruby >= 3.1
- rails: 7.2
ruby: 2.7
- rails: 7.2
ruby: 3.0
# Rails 8.0 is Ruby >= 3.2
- rails: '8.0'
ruby: 2.7
- rails: '8.0'
ruby: 3.0
- rails: '8.0'
ruby: 3.1
- rails: '8.0'
ruby: jruby-9.4
# Rails main is Ruby >= 3.2
- rails: main
ruby: 2.7
- rails: main
ruby: 3.0
- rails: main
ruby: 3.1
# JDBC adapters don't support the latest Rails
- rails: 7.2
ruby: jruby-9.4
- rails: main
ruby: jruby-9.4

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ source 'https://rubygems.org'
gemspec

gem 'aws-actiondispatch-dynamodb', git: 'https://github.com/aws/aws-actiondispatch-dynamodb-ruby'
gem 'aws-actionmailer-ses', git: 'https://github.com/aws/aws-actionmailer-ses-ruby'
gem 'aws-actionmailbox-ses', git: 'https://github.com/aws/aws-actionmailbox-ses-ruby', branch: 'init'
gem 'aws-actionmailer-ses', git: 'https://github.com/aws/aws-actionmailer-ses-ruby'

group :development, :test do
gem 'pry'
Expand Down
16 changes: 0 additions & 16 deletions gemfiles/rails-7.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,3 @@
eval_gemfile '../Gemfile'

gem 'rails', '~> 7.1.0'

group :test do
# JDBC versions track Rails versions
gem 'activerecord-jdbc-adapter', '~> 71.0',
platform: :jruby,
# this is not published for some reason
git: 'https://github.com/jruby/activerecord-jdbc-adapter',
glob: 'activerecord-jdbc-adapter.gemspec'
gem 'activerecord-jdbcsqlite3-adapter', '~> 71.0',
platform: :jruby,
# this is not published for some reason
git: 'https://github.com/jruby/activerecord-jdbc-adapter',
glob: 'activerecord-jdbcsqlite3-adapter/activerecord-jdbcsqlite3-adapter.gemspec'
# last supported version of sqlite3 for minimum ruby
gem 'sqlite3', '~> 1.6.0', platform: :ruby
end
16 changes: 0 additions & 16 deletions gemfiles/rails-7.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,3 @@
eval_gemfile '../Gemfile'

gem 'rails', '~> 7.2.0'

group :test do
# JDBC versions track Rails versions
gem 'activerecord-jdbc-adapter', '~> 71.0',
platform: :jruby,
# this is not published for some reason
git: 'https://github.com/jruby/activerecord-jdbc-adapter',
glob: 'activerecord-jdbc-adapter.gemspec'
gem 'activerecord-jdbcsqlite3-adapter', '~> 71.0',
platform: :jruby,
# this is not published for some reason
git: 'https://github.com/jruby/activerecord-jdbc-adapter',
glob: 'activerecord-jdbcsqlite3-adapter/activerecord-jdbcsqlite3-adapter.gemspec'
# last supported version of sqlite3 for minimum ruby
gem 'sqlite3', '~> 1.6.0', platform: :ruby
end
5 changes: 5 additions & 0 deletions gemfiles/rails-8.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# frozen_string_literal: true

eval_gemfile '../Gemfile'

gem 'rails', '~> 8.0.0'
15 changes: 0 additions & 15 deletions gemfiles/rails-main.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,3 @@
eval_gemfile '../Gemfile'

gem 'rails', github: 'rails/rails'

group :test do
# JDBC versions track Rails versions
gem 'activerecord-jdbc-adapter', '~> 71.0',
platform: :jruby,
# this is not published for some reason
git: 'https://github.com/jruby/activerecord-jdbc-adapter',
glob: 'activerecord-jdbc-adapter.gemspec'
gem 'activerecord-jdbcsqlite3-adapter', '~> 71.0',
platform: :jruby,
# this is not published for some reason
git: 'https://github.com/jruby/activerecord-jdbc-adapter',
glob: 'activerecord-jdbcsqlite3-adapter/activerecord-jdbcsqlite3-adapter.gemspec'
gem 'sqlite3', platform: :ruby
end

0 comments on commit af53983

Please sign in to comment.