Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI matrices #422

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,16 @@ permissions:

jobs:
test:
runs-on: ubuntu-18.04
runs-on: ubuntu-24.04
strategy:
matrix:
ruby_version: ['3.1', '3.0', '2.7']
rails_version: ['6.0.x', '6.1.x', '7.0.x', 'edge']
ruby_version: ['3.4', '3.3', '3.2', '3.1']
rails_version: ['7.0.x', '7.1.x', '7.2.x', '8.0.x', 'edge']
exclude:
- ruby_version: '3.1'
rails_version: '8.0.x'
- ruby_version: '3.1'
rails_version: 'edge'
name: Ruby ${{ matrix.ruby_version }} on Rails ${{ matrix.rails_version }}
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/Gemfile-rails.${{ matrix.rails_version }}
Expand All @@ -22,7 +27,7 @@ jobs:
run: |
sudo apt-get update -qq
sudo apt-get install -qq graphviz
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby_version }}
Expand Down
56 changes: 0 additions & 56 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Browse the [gallery](https://voormedia.github.io/rails-erd/gallery.html) for mor
Requirements
---------------

* Ruby 1.9.3+
* ActiveRecord 3.x - 5.0.x
* Ruby 2.2+
* ActiveRecord 4.2+

Getting started
---------------
Expand Down
22 changes: 0 additions & 22 deletions gemfiles/Gemfile-rails.4.2.x

This file was deleted.

22 changes: 0 additions & 22 deletions gemfiles/Gemfile-rails.5.0.x

This file was deleted.

21 changes: 0 additions & 21 deletions gemfiles/Gemfile-rails.5.1.x

This file was deleted.

7 changes: 6 additions & 1 deletion gemfiles/Gemfile-rails.7.0.x
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ source "http://rubygems.org"

gemspec :path => ".."

gem "bigdecimal" # is a bundled gem since Ruby 3.4
gem "concurrent-ruby", "< 1.3.5" # https://github.com/rails/rails/issues/54260
gem "drb" # is a bundled gem since Ruby 3.4
gem "mutex_m" # is a bundled gem since Ruby 3.4

gem "activerecord", "~> 7.0.0"

group :development do
Expand All @@ -10,7 +15,7 @@ group :development do
gem "yard"

platforms :ruby do
gem "sqlite3", '~> 1.4'
gem "sqlite3", "~> 1.4"
gem "redcarpet"
end

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/Gemfile-rails.6.1.x → gemfiles/Gemfile-rails.7.1.x
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ source "http://rubygems.org"

gemspec :path => ".."

gem "activerecord", "~> 6.1.1"
gem "activerecord", "~> 7.1.0"

group :development do
gem 'mocha'
gem "rake"
gem "yard"

platforms :ruby do
gem "sqlite3", '~> 1.4'
gem "sqlite3"
gem "redcarpet"
end

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/Gemfile-rails.5.2.x → gemfiles/Gemfile-rails.7.2.x
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ source "http://rubygems.org"

gemspec :path => ".."

gem "activerecord", "~> 5.2.0"
gem "activerecord", "~> 7.2.0"

group :development do
gem 'mocha'
gem "rake"
gem "yard"

platforms :ruby do
gem "sqlite3", '~> 1.3.13'
gem "sqlite3"
gem "redcarpet"
end

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/Gemfile-rails.6.0.x → gemfiles/Gemfile-rails.8.0.x
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ source "http://rubygems.org"

gemspec :path => ".."

gem "activerecord", "~> 6.0.0rc1"
gem "activerecord", "~> 8.0.0"

group :development do
gem 'mocha'
gem "rake"
gem "yard"

platforms :ruby do
gem "sqlite3", '~> 1.4'
gem "sqlite3"
gem "redcarpet"
end

Expand Down
2 changes: 1 addition & 1 deletion test/unit/rake_task_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def teardown
rescue => e
message = e.message
end
assert_match(/#{Regexp.escape(<<-MSG.strip).gsub("xxx", ".*?")}/, message
assert_match(/#{Regexp.escape(<<-MSG.strip).gsub("`xxx'", "(`|').*?")}/, message
Loading models failed!
Error occurred while loading application: FooBar (RuntimeError)
test/unit/rake_task_test.rb:#{l1}:in `xxx'
Expand Down