diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 81b99e10..c9550555 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 }} @@ -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 }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ed2c60cd..00000000 --- a/.travis.yml +++ /dev/null @@ -1,56 +0,0 @@ -language: ruby -rvm: - - 2.2 - - 2.3 - - 2.4 - - 2.5 - - 2.6 - - 2.7 - - 3.0 - - 3.1 - - jruby -gemfile: - - gemfiles/Gemfile-rails.4.2.x - - gemfiles/Gemfile-rails.5.0.x - - gemfiles/Gemfile-rails.5.1.x - - gemfiles/Gemfile-rails.5.2.x - - gemfiles/Gemfile-rails.6.0.x - - gemfiles/Gemfile-rails.6.1.x - - gemfiles/Gemfile-rails.7.0.x - - gemfiles/Gemfile-rails.edge -before_install: - - gem install bundler -v '< 2' - - sudo apt-get update -qq - - sudo apt-get install -qq graphviz -script: bundle exec rake -matrix: - allow_failures: - - rvm: jruby - - gemfile: gemfiles/Gemfile-rails.edge - fast_finish: true - exclude: - - rvm: 2.2 - gemfile: gemfiles/Gemfile-rails.6.0.x - - rvm: 2.2 - gemfile: gemfiles/Gemfile-rails.6.1.x - - rvm: 2.2 - gemfile: gemfiles/Gemfile-rails.7.0.x - - rvm: 2.2 - gemfile: gemfiles/Gemfile-rails.edge - - rvm: 2.3 - gemfile: gemfiles/Gemfile-rails.6.0.x - - rvm: 2.3 - gemfile: gemfiles/Gemfile-rails.6.1.x - - rvm: 2.3 - gemfile: gemfiles/Gemfile-rails.7.0.x - - rvm: 2.3 - gemfile: gemfiles/Gemfile-rails.edge - - rvm: 2.4 - gemfile: gemfiles/Gemfile-rails.6.0.x - - rvm: 2.4 - gemfile: gemfiles/Gemfile-rails.6.1.x - - rvm: 2.4 - gemfile: gemfiles/Gemfile-rails.7.0.x - - rvm: 2.4 - gemfile: gemfiles/Gemfile-rails.edge -cache: bundler diff --git a/README.md b/README.md index afa4bafc..42a2ec3f 100644 --- a/README.md +++ b/README.md @@ -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 --------------- diff --git a/gemfiles/Gemfile-rails.4.2.x b/gemfiles/Gemfile-rails.4.2.x deleted file mode 100644 index 6c0bb7b7..00000000 --- a/gemfiles/Gemfile-rails.4.2.x +++ /dev/null @@ -1,22 +0,0 @@ -source "http://rubygems.org" - -gemspec :path => ".." - -gem "activerecord", "~> 4.2.0" - -group :development do - gem 'minitest', '5.10.1' - gem 'mocha' - gem "rake" - gem "yard" - - platforms :ruby do - gem "sqlite3", '~> 1.3.13' - gem "redcarpet" - end - - platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter" - gem "jruby-openssl", :require => false # Silence openssl warnings. - end -end diff --git a/gemfiles/Gemfile-rails.5.0.x b/gemfiles/Gemfile-rails.5.0.x deleted file mode 100644 index fa75b47c..00000000 --- a/gemfiles/Gemfile-rails.5.0.x +++ /dev/null @@ -1,22 +0,0 @@ -source "http://rubygems.org" - -gemspec :path => ".." - -gem "activerecord", "~> 5.0.2" - -group :development do - gem 'minitest', '5.10.1' - gem 'mocha' - gem "rake" - gem "yard" - - platforms :ruby do - gem "sqlite3", '~> 1.3.13' - gem "redcarpet" - end - - platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter" - gem "jruby-openssl", :require => false # Silence openssl warnings. - end -end diff --git a/gemfiles/Gemfile-rails.5.1.x b/gemfiles/Gemfile-rails.5.1.x deleted file mode 100644 index b49f845b..00000000 --- a/gemfiles/Gemfile-rails.5.1.x +++ /dev/null @@ -1,21 +0,0 @@ -source "http://rubygems.org" - -gemspec :path => ".." - -gem "activerecord", "~> 5.1.0" - -group :development do - gem 'mocha' - gem "rake" - gem "yard" - - platforms :ruby do - gem "sqlite3", '~> 1.3.13' - gem "redcarpet" - end - - platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter" - gem "jruby-openssl", :require => false # Silence openssl warnings. - end -end diff --git a/gemfiles/Gemfile-rails.7.0.x b/gemfiles/Gemfile-rails.7.0.x index 61f08e2c..be4e5090 100644 --- a/gemfiles/Gemfile-rails.7.0.x +++ b/gemfiles/Gemfile-rails.7.0.x @@ -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 @@ -10,7 +15,7 @@ group :development do gem "yard" platforms :ruby do - gem "sqlite3", '~> 1.4' + gem "sqlite3", "~> 1.4" gem "redcarpet" end diff --git a/gemfiles/Gemfile-rails.6.1.x b/gemfiles/Gemfile-rails.7.1.x similarity index 84% rename from gemfiles/Gemfile-rails.6.1.x rename to gemfiles/Gemfile-rails.7.1.x index f686f7bc..da8b2706 100644 --- a/gemfiles/Gemfile-rails.6.1.x +++ b/gemfiles/Gemfile-rails.7.1.x @@ -2,7 +2,7 @@ source "http://rubygems.org" gemspec :path => ".." -gem "activerecord", "~> 6.1.1" +gem "activerecord", "~> 7.1.0" group :development do gem 'mocha' @@ -10,7 +10,7 @@ group :development do gem "yard" platforms :ruby do - gem "sqlite3", '~> 1.4' + gem "sqlite3" gem "redcarpet" end diff --git a/gemfiles/Gemfile-rails.5.2.x b/gemfiles/Gemfile-rails.7.2.x similarity index 83% rename from gemfiles/Gemfile-rails.5.2.x rename to gemfiles/Gemfile-rails.7.2.x index 8cc48395..d278eca8 100644 --- a/gemfiles/Gemfile-rails.5.2.x +++ b/gemfiles/Gemfile-rails.7.2.x @@ -2,7 +2,7 @@ source "http://rubygems.org" gemspec :path => ".." -gem "activerecord", "~> 5.2.0" +gem "activerecord", "~> 7.2.0" group :development do gem 'mocha' @@ -10,7 +10,7 @@ group :development do gem "yard" platforms :ruby do - gem "sqlite3", '~> 1.3.13' + gem "sqlite3" gem "redcarpet" end diff --git a/gemfiles/Gemfile-rails.6.0.x b/gemfiles/Gemfile-rails.8.0.x similarity index 83% rename from gemfiles/Gemfile-rails.6.0.x rename to gemfiles/Gemfile-rails.8.0.x index dcc5e727..447abdb1 100644 --- a/gemfiles/Gemfile-rails.6.0.x +++ b/gemfiles/Gemfile-rails.8.0.x @@ -2,7 +2,7 @@ source "http://rubygems.org" gemspec :path => ".." -gem "activerecord", "~> 6.0.0rc1" +gem "activerecord", "~> 8.0.0" group :development do gem 'mocha' @@ -10,7 +10,7 @@ group :development do gem "yard" platforms :ruby do - gem "sqlite3", '~> 1.4' + gem "sqlite3" gem "redcarpet" end diff --git a/test/unit/rake_task_test.rb b/test/unit/rake_task_test.rb index 790d284c..63d9ab68 100644 --- a/test/unit/rake_task_test.rb +++ b/test/unit/rake_task_test.rb @@ -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'