Skip to content

Commit

Permalink
Merge pull request #26 from kvokka/bump-matrix-versions
Browse files Browse the repository at this point in the history
Bump matrix versions
  • Loading branch information
kvokka authored Dec 21, 2024
2 parents 19c37a1 + 3b1d9ca commit 6e1cddb
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 112 deletions.
43 changes: 12 additions & 31 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
59 changes: 24 additions & 35 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 0 additions & 16 deletions gemfiles/rails_5.gemfile

This file was deleted.

16 changes: 0 additions & 16 deletions gemfiles/rails_6_1.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion gemfiles/rails_7_0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_5_1.gemfile → gemfiles/rails_7_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_5_2.gemfile → gemfiles/rails_7_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_6_0.gemfile → gemfiles/rails_8_0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pp_sql.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 6e1cddb

Please sign in to comment.