From 3b1d9ca7fb93248aa5bcb8da86ad1a29940b2289 Mon Sep 17 00:00:00 2001 From: kvokka Date: Sun, 22 Dec 2024 04:12:16 +0700 Subject: [PATCH] Bump matrix versions --- .github/workflows/ruby.yml | 43 ++++---------- Appraisals | 59 ++++++++----------- ...d_5_2.gemfile => activerecord_7_1.gemfile} | 4 +- ...d_6_0.gemfile => activerecord_7_2.gemfile} | 4 +- ...d_6_1.gemfile => activerecord_8_0.gemfile} | 4 +- gemfiles/rails_5.gemfile | 16 ----- gemfiles/rails_6_1.gemfile | 16 ----- gemfiles/rails_7_0.gemfile | 2 +- .../{rails_5_1.gemfile => rails_7_1.gemfile} | 4 +- .../{rails_5_2.gemfile => rails_7_2.gemfile} | 4 +- .../{rails_6_0.gemfile => rails_8_0.gemfile} | 4 +- pp_sql.gemspec | 2 +- 12 files changed, 50 insertions(+), 112 deletions(-) rename gemfiles/{activerecord_5_2.gemfile => activerecord_7_1.gemfile} (80%) rename gemfiles/{activerecord_6_0.gemfile => activerecord_7_2.gemfile} (80%) rename gemfiles/{activerecord_6_1.gemfile => activerecord_8_0.gemfile} (80%) delete mode 100644 gemfiles/rails_5.gemfile delete mode 100644 gemfiles/rails_6_1.gemfile rename gemfiles/{rails_5_1.gemfile => rails_7_1.gemfile} (81%) rename gemfiles/{rails_5_2.gemfile => rails_7_2.gemfile} (81%) rename gemfiles/{rails_6_0.gemfile => rails_8_0.gemfile} (81%) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index a14e12c..0d6887e 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -22,47 +22,28 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['2.6', '2.7', '3.0', '3.1'] + ruby-version: ['3.1', '3.2', '3.3'] gemfile: - - gemfiles/rails_5.gemfile - - gemfiles/rails_5_1.gemfile - - gemfiles/rails_5_2.gemfile - - gemfiles/rails_6_0.gemfile - - gemfiles/rails_6_1.gemfile - gemfiles/rails_7_0.gemfile - - gemfiles/activerecord_5_2.gemfile - - gemfiles/activerecord_6_0.gemfile - - gemfiles/activerecord_6_1.gemfile + - gemfiles/rails_7_1.gemfile + - gemfiles/rails_7_2.gemfile + - gemfiles/rails_8_0.gemfile - gemfiles/activerecord_7_0.gemfile + - gemfiles/activerecord_7_1.gemfile + - gemfiles/activerecord_7_2.gemfile + - gemfiles/activerecord_8_0.gemfile exclude: - - ruby-version: 3.0 - gemfile: gemfiles/rails_5.gemfile - - ruby-version: 3.1 - gemfile: gemfiles/rails_5.gemfile - - ruby-version: 3.0 - gemfile: gemfiles/rails_5_1.gemfile - - ruby-version: 3.1 - gemfile: gemfiles/rails_5_1.gemfile - - ruby-version: 3.0 - gemfile: gemfiles/rails_5_2.gemfile - - ruby-version: 3.1 - gemfile: gemfiles/rails_5_2.gemfile - - ruby-version: 3.0 - gemfile: gemfiles/activerecord_5_2.gemfile - - ruby-version: 3.1 - gemfile: gemfiles/activerecord_5_2.gemfile - - ruby-version: 2.6 - gemfile: gemfiles/rails_7_0.gemfile - - ruby-version: 2.6 - gemfile: gemfiles/activerecord_7_0.gemfile + - ruby-version: '3.1' + gemfile: gemfiles/rails_8_0.gemfile + - ruby-version: '3.1' + gemfile: gemfiles/activerecord_8_0.gemfile steps: - uses: actions/checkout@v3 - name: Set up Ruby # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, # change this to (see https://github.com/ruby/setup-ruby#versioning): - # uses: ruby/setup-ruby@v1 - uses: ruby/setup-ruby@ee2113536afb7f793eed4ce60e8d3b26db912da4 # v1.127.0 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true # runs 'bundle install' and caches installed gems automatically diff --git a/Appraisals b/Appraisals index 6e95453..3564da6 100644 --- a/Appraisals +++ b/Appraisals @@ -1,55 +1,44 @@ # frozen_string_literal: true -appraise 'rails-5' do - gem 'rails', '~> 5.0.0' - gem 'sqlite3', '~> 1.3.6' -end - -appraise 'rails-5-1' do - gem 'rails', '~> 5.1.0' - gem 'sqlite3', '~> 1.4' +appraise 'rails-7-0' do + gem 'rails', '~> 7.0.0' + gem 'sqlite3', '~> 1.6' end -appraise 'rails-5-2' do - gem 'rails', '~> 5.2.0' - gem 'sqlite3', '~> 1.4' +appraise 'rails-7-1' do + gem 'rails', '~> 7.1.0' + gem 'sqlite3', '~> 2.0' end -appraise 'rails-6-0' do - gem 'rails', '~> 6.0.0' - gem 'sqlite3', '~> 1.4' +appraise 'rails-7-2' do + gem 'rails', '~> 7.2.0' + gem 'sqlite3', '~> 2.0' end -appraise 'rails-6-1' do - gem 'rails', '~> 6.1.0' - gem 'sqlite3', '~> 1.4' +appraise 'rails-8-0' do + gem 'rails', '~> 8.0.0' + gem 'sqlite3', '~> 2.0' end -appraise 'rails-7-0' do - gem 'rails', '~> 7.0.0' - gem 'sqlite3', '~> 1.6' -end - -appraise 'activerecord-5-2' do - gem 'activerecord', '~> 5.2.0' +appraise 'activerecord-7-0' do + gem 'activerecord', '~> 7.0.0' gem 'rake' - gem 'sqlite3', '~> 1.4' + gem 'sqlite3', '~> 1.6' end -appraise 'activerecord-6-0' do - gem 'activerecord', '~> 6.0.0' +appraise 'activerecord-7-1' do + gem 'activerecord', '~> 7.1.0' gem 'rake' - gem 'sqlite3', '~> 1.4' + gem 'sqlite3', '~> 2.0' end -appraise 'activerecord-6-1' do - gem 'activerecord', '~> 6.1.0' +appraise 'activerecord-7-2' do + gem 'activerecord', '~> 7.2.0' gem 'rake' - gem 'sqlite3', '~> 1.4' + gem 'sqlite3', '~> 2.0' end - -appraise 'activerecord-7-0' do - gem 'activerecord', '~> 7.0.0' +appraise 'activerecord-8-0' do + gem 'activerecord', '~> 8.0.0' gem 'rake' - gem 'sqlite3', '~> 1.6' + gem 'sqlite3', '~> 2.0' end diff --git a/gemfiles/activerecord_5_2.gemfile b/gemfiles/activerecord_7_1.gemfile similarity index 80% rename from gemfiles/activerecord_5_2.gemfile rename to gemfiles/activerecord_7_1.gemfile index ad75c2e..eed5cb7 100644 --- a/gemfiles/activerecord_5_2.gemfile +++ b/gemfiles/activerecord_7_1.gemfile @@ -2,9 +2,9 @@ source "https://rubygems.org" -gem "activerecord", "~> 5.2.0" +gem "activerecord", "~> 7.1.0" gem "rake" -gem "sqlite3", "~> 1.4" +gem "sqlite3", "~> 2.0" group :local_development do gem "appraisal" diff --git a/gemfiles/activerecord_6_0.gemfile b/gemfiles/activerecord_7_2.gemfile similarity index 80% rename from gemfiles/activerecord_6_0.gemfile rename to gemfiles/activerecord_7_2.gemfile index 8c32242..5374c1d 100644 --- a/gemfiles/activerecord_6_0.gemfile +++ b/gemfiles/activerecord_7_2.gemfile @@ -2,9 +2,9 @@ source "https://rubygems.org" -gem "activerecord", "~> 6.0.0" +gem "activerecord", "~> 7.2.0" gem "rake" -gem "sqlite3", "~> 1.4" +gem "sqlite3", "~> 2.0" group :local_development do gem "appraisal" diff --git a/gemfiles/activerecord_6_1.gemfile b/gemfiles/activerecord_8_0.gemfile similarity index 80% rename from gemfiles/activerecord_6_1.gemfile rename to gemfiles/activerecord_8_0.gemfile index b528953..2d94a06 100644 --- a/gemfiles/activerecord_6_1.gemfile +++ b/gemfiles/activerecord_8_0.gemfile @@ -2,9 +2,9 @@ source "https://rubygems.org" -gem "activerecord", "~> 6.1.0" +gem "activerecord", "~> 8.0.0" gem "rake" -gem "sqlite3", "~> 1.5" +gem "sqlite3", "~> 2.0" group :local_development do gem "appraisal" diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile deleted file mode 100644 index 29d5301..0000000 --- a/gemfiles/rails_5.gemfile +++ /dev/null @@ -1,16 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 5.0.0" -gem "sqlite3", "~> 1.3.6" - -group :local_development do - gem "appraisal" - gem "overcommit" - gem "pry" - gem "reek" - gem "rubocop", "~> 0.71.0" -end - -gemspec path: "../" diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile deleted file mode 100644 index 8703756..0000000 --- a/gemfiles/rails_6_1.gemfile +++ /dev/null @@ -1,16 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 6.1.0" -gem "sqlite3", "~> 1.4" - -group :local_development do - gem "appraisal" - gem "overcommit" - gem "pry" - gem "reek" - gem "rubocop", "~> 0.71.0" -end - -gemspec path: "../" diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile index 8703756..2b1fcd2 100644 --- a/gemfiles/rails_7_0.gemfile +++ b/gemfiles/rails_7_0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "~> 6.1.0" +gem "rails", "~> 7.0.0" gem "sqlite3", "~> 1.4" group :local_development do diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_7_1.gemfile similarity index 81% rename from gemfiles/rails_5_1.gemfile rename to gemfiles/rails_7_1.gemfile index 0644d24..e733990 100644 --- a/gemfiles/rails_5_1.gemfile +++ b/gemfiles/rails_7_1.gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" -gem "rails", "~> 5.1.0" -gem "sqlite3", "~> 1.4" +gem "rails", "~> 7.1.0" +gem "sqlite3", "~> 2.0" group :local_development do gem "appraisal" diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_7_2.gemfile similarity index 81% rename from gemfiles/rails_5_2.gemfile rename to gemfiles/rails_7_2.gemfile index f98c51c..6b98d8e 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_7_2.gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" -gem "rails", "~> 5.2.0" -gem "sqlite3", "~> 1.4" +gem "rails", "~> 7.2.0" +gem "sqlite3", "~> 2.0" group :local_development do gem "appraisal" diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_8_0.gemfile similarity index 81% rename from gemfiles/rails_6_0.gemfile rename to gemfiles/rails_8_0.gemfile index 8b82f7a..dcc3bf7 100644 --- a/gemfiles/rails_6_0.gemfile +++ b/gemfiles/rails_8_0.gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" -gem "rails", "~> 6.0.0" -gem "sqlite3", "~> 1.4" +gem "rails", "~> 8.0.0" +gem "sqlite3", "~> 2.0" group :local_development do gem "appraisal" diff --git a/pp_sql.gemspec b/pp_sql.gemspec index a4e44e3..62ec270 100644 --- a/pp_sql.gemspec +++ b/pp_sql.gemspec @@ -24,6 +24,6 @@ Gem::Specification.new do |s| s.add_development_dependency 'minitest' s.add_development_dependency 'minitest-focus' s.add_development_dependency 'minitest-reporters' - s.add_development_dependency 'rails', '>= 5.0' + s.add_development_dependency 'rails', '>= 7.0' s.add_development_dependency 'sqlite3', '>= 1.4' end