diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 87bc921..c74db7d 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -22,7 +22,7 @@ jobs: - '2.5' - '2.4' - '2.3' - - 'jruby-9.2.9.0' + - 'jruby-9.2.17.0' gemfile: - gemfiles/active_record_60.gemfile - gemfiles/active_record_52.gemfile @@ -70,12 +70,12 @@ jobs: gemfile: gemfiles/active_record_edge.gemfile - ruby_version: '2.3' gemfile: gemfiles/active_record_60.gemfile - - ruby_version: 'jruby-9.2.9.0' + - ruby_version: 'jruby-9.2.17.0' gemfile: gemfiles/active_record_42.gemfile - - ruby_version: 'jruby-9.2.9.0' + - ruby_version: 'jruby-9.2.17.0' gemfile: gemfiles/active_record_41.gemfile - - ruby_version: 'jruby-9.2.9.0' - gemfile: gemfiles/active_record_edge.gemfile + - ruby_version: 'jruby-9.2.17.0' + gemfile: gemfiles/active_record_edge.gemfile include: - ruby_version: 'ruby-head' gemfile: gemfiles/active_record_edge.gemfile @@ -99,7 +99,7 @@ jobs: with: ruby-version: ${{ matrix.ruby_version }} bundler-cache: true - continue-on-error: ${{ matrix.ruby_version == 'ruby-head' || matrix.ruby_version == 'jruby-9.2.9.0' || matrix.gemfile == 'gemfiles/active_record_edge.gemfile' }} + continue-on-error: ${{ matrix.ruby_version == 'ruby-head' || matrix.ruby_version == 'jruby-9.2.17.0' || matrix.gemfile == 'gemfiles/active_record_edge.gemfile' }} - run: mv kaminari-core/test/fake_app/config/database_gha.yml kaminari-core/test/fake_app/config/database.yml - run: bundle exec rake test - continue-on-error: ${{ matrix.ruby_version == 'ruby-head' || matrix.ruby_version == 'jruby-9.2.9.0' || matrix.gemfile == 'gemfiles/active_record_edge.gemfile' }} + continue-on-error: ${{ matrix.ruby_version == 'ruby-head' || matrix.ruby_version == 'jruby-9.2.17.0' || matrix.gemfile == 'gemfiles/active_record_edge.gemfile' }} diff --git a/.travis.yml b/.travis.yml index 94d56d7..415b8e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,12 @@ services: - mysql rvm: - - 2.7.0 - - 2.6.3 - - 2.5.5 - - 2.4.5 + - 2.7.3 + - 2.6.7 + - 2.5.9 + - 2.4.10 - 2.3.8 - - jruby-9.2.9.0 + - jruby-9.2.17.0 # - rbx-3 gemfile: @@ -39,31 +39,31 @@ cache: bundler matrix: exclude: - - rvm: 2.7.0 + - rvm: 2.7.3 gemfile: gemfiles/active_record_52.gemfile - - rvm: 2.7.0 + - rvm: 2.7.3 gemfile: gemfiles/active_record_51.gemfile - - rvm: 2.7.0 + - rvm: 2.7.3 gemfile: gemfiles/active_record_50.gemfile - - rvm: 2.7.0 + - rvm: 2.7.3 gemfile: gemfiles/active_record_42.gemfile - - rvm: 2.7.0 + - rvm: 2.7.3 gemfile: gemfiles/active_record_41.gemfile - - rvm: 2.6.3 + - rvm: 2.6.7 gemfile: gemfiles/active_record_42.gemfile - - rvm: 2.6.3 + - rvm: 2.6.7 gemfile: gemfiles/active_record_41.gemfile - - rvm: 2.5.5 + - rvm: 2.5.9 gemfile: gemfiles/active_record_42.gemfile - - rvm: 2.5.5 + - rvm: 2.5.9 gemfile: gemfiles/active_record_41.gemfile - - rvm: 2.4.5 + - rvm: 2.4.10 gemfile: gemfiles/active_record_edge.gemfile - - rvm: 2.4.5 + - rvm: 2.4.10 gemfile: gemfiles/active_record_60.gemfile - - rvm: 2.4.5 + - rvm: 2.4.10 gemfile: gemfiles/active_record_42.gemfile - - rvm: 2.4.5 + - rvm: 2.4.10 gemfile: gemfiles/active_record_41.gemfile - rvm: 2.3.8 gemfile: gemfiles/active_record_edge.gemfile @@ -73,9 +73,9 @@ matrix: gemfile: gemfiles/active_record_42.gemfile - rvm: ruby-head gemfile: gemfiles/active_record_41.gemfile - - rvm: jruby-9.2.9.0 + - rvm: jruby-9.2.17.0 gemfile: gemfiles/active_record_42.gemfile - - rvm: jruby-9.2.9.0 + - rvm: jruby-9.2.17.0 gemfile: gemfiles/active_record_41.gemfile include: - rvm: ruby-head @@ -92,7 +92,7 @@ matrix: env: DB=sqlite3 allow_failures: - rvm: ruby-head - - rvm: jruby-9.2.9.0 + - rvm: jruby-9.2.17.0 # - rvm: rbx-3 - gemfile: gemfiles/active_record_edge.gemfile fast_finish: true