Skip to content

Commit

Permalink
Add rails 8 to CI build
Browse files Browse the repository at this point in the history
  • Loading branch information
moiristo committed Nov 20, 2024
1 parent 3dac72e commit 27c5a4a
Show file tree
Hide file tree
Showing 19 changed files with 206 additions and 132 deletions.
24 changes: 16 additions & 8 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ jobs:
include:
- ruby-version: 2.7.5
appraisal: "7.0"
- ruby-version: 3.3.5
appraisal: "8.0"
exclude:
- ruby-version: 2.3.0
appraisal: "4.0"
- ruby-version: 2.3.0
appraisal: "4.2"
- ruby-version: 2.3.0
Expand All @@ -46,6 +50,8 @@ jobs:
appraisal: "4.1"
- ruby-version: 2.5.5
appraisal: "4.2"
- ruby-version: 2.5.5
appraisal: "5.2"
- ruby-version: 2.6.3
appraisal: "3.2"
- ruby-version: 2.6.3
Expand All @@ -62,12 +68,14 @@ jobs:
with:
ruby-version: ${{ matrix.ruby-version }}
rubygems: default
bundler: none
- name: Install compatible bundler for all envs
run: gem install bundler -v 1.17.3
- name: Bundle for Appraisal
run: bundle
- name: Install Appraisal dependencies
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
bundler: "1.17.3"
- name: Remove default Gemfile
run: rm -f Gemfile
- name: Remove default Gemfile.lock
run: rm -f Gemfile.lock
- name: Set Gemfile
run: cp gemfiles/${{ matrix.appraisal }}.gemfile Gemfile
- name: Bundle
run: bundle install
- name: Run tests
run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec rake test
run: bundle exec rake
13 changes: 12 additions & 1 deletion Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,43 @@
appraise '3.2' do
gem 'activerecord', '~> 3.2.0'
gem 'i18n', '~> 0.6.5'
gem 'sqlite3', '~> 1.3.13'
end

appraise '4.0' do
gem 'activerecord', '~> 4.0.0'
gem 'i18n', '~> 0.6.5'
gem 'sqlite3', '~> 1.3.13'
end

appraise '4.1' do
gem 'activerecord', '~> 4.1.0'
gem 'i18n', '~> 0.6.9'
gem 'sqlite3', '~> 1.3.13'
end

appraise '4.2' do
gem 'activerecord', '~> 4.2.3'
gem 'i18n', '~> 0.7.0'
gem 'sqlite3', '~> 1.3.13'
end

appraise '5.0' do
gem 'activerecord', '~> 5.0.0'
gem 'i18n', '~> 0.7.0'
gem 'sqlite3', '~> 1.3.13'
end

appraise '5.1' do
gem 'activerecord', '~> 5.1.0'
gem 'i18n', '~> 0.7.0'
gem 'sqlite3', '~> 1.3.13'
end

appraise '5.2' do
gem 'activerecord', '~> 5.2.0'
gem 'i18n', '~> 0.7.0'
gem 'sqlite3', '~> 1.3.13'
end

appraise '6.0' do
Expand All @@ -42,5 +49,9 @@ end

appraise '7.0' do
gem 'activerecord', '~> 7.0.0'
gem 'sqlite3', '~> 1.4.2'
gem 'sqlite3', '~> 1.4.1'
end

appraise '8.0' do
gem 'activerecord', '~> 8.0.0'
end
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [3.2.0] - 2021-12-28
## [3.2.0] - 2024-11-20

- Added Ruby 3.3.5 support
- Added Rails 8.0 support

### Added

Expand All @@ -30,7 +33,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Fixed

- Ensure the initial options hash is never modified
- When using conditions in combination with array includes, ensure nested includes are not accidentally deleted
- When using conditions in combination with array includes, ensure nested includes are not accidentally deleted

### Removed

Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

source 'http://rubygems.org'

gem 'activerecord', '>= 3.1.0', '< 8'
gem 'bundler', '~> 1.17.3', :group => :test
gem 'activerecord', '>= 3.1.0', '< 9'
gem 'bundler', :group => :test
gem 'rake', '~> 12.3', :group => :test

gem 'appraisal', :group => :test
gem 'minitest', :group => :test
gem 'sqlite3', '~> 1.3.13', :group => :test
gem 'sqlite3', '~> 2.2', :group => :test
67 changes: 42 additions & 25 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,43 +1,60 @@
GEM
remote: http://rubygems.org/
specs:
activemodel (5.2.0)
activesupport (= 5.2.0)
activerecord (5.2.0)
activemodel (= 5.2.0)
activesupport (= 5.2.0)
arel (>= 9.0)
activesupport (5.2.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
appraisal (2.2.0)
activemodel (8.0.0)
activesupport (= 8.0.0)
activerecord (8.0.0)
activemodel (= 8.0.0)
activesupport (= 8.0.0)
timeout (>= 0.4.0)
activesupport (8.0.0)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
appraisal (2.5.0)
bundler
rake
thor (>= 0.14.0)
arel (9.0.0)
concurrent-ruby (1.0.5)
i18n (1.0.0)
base64 (0.2.0)
benchmark (0.4.0)
bigdecimal (3.1.8)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
drb (2.2.1)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
minitest (5.11.3)
logger (1.6.1)
mini_portile2 (2.8.7)
minitest (5.25.1)
rake (12.3.3)
sqlite3 (1.3.13)
thor (0.20.3)
thread_safe (0.3.6)
tzinfo (1.2.10)
thread_safe (~> 0.1)
securerandom (0.3.2)
sqlite3 (2.2.0)
mini_portile2 (~> 2.8.0)
thor (1.3.2)
timeout (0.4.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uri (1.0.2)

PLATFORMS
ruby

DEPENDENCIES
activerecord (>= 3.1.0, < 8)
activerecord (>= 3.1.0, < 9)
appraisal
bundler (~> 1.17.3)
bundler
minitest
rake (~> 12.3)
sqlite3 (~> 1.3.13)
sqlite3 (~> 2.2)

BUNDLED WITH
1.17.3
2.5.20
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2021 Reinier de Lange
Copyright (c) 2024 Reinier de Lange

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
16 changes: 6 additions & 10 deletions gemfiles/3.2.gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'activerecord', '~> 3.2.0'
gem 'appraisal', :group => :test
gem 'bundler', '~> 1.17.3', :group => :test
gem 'i18n', '~> 0.6.5'
gem 'minitest', :group => :test
gem 'rake', '~> 10.4', :group => :test
gem 'sqlite3', '~> 1.3.13', :group => :test
gem "activerecord", "~> 3.2.0"
gem "appraisal", group: :test
gem "minitest", group: :test
gem "sqlite3", "~> 1.3.13", group: :test
gem "i18n", "~> 0.6.5", group: :test
16 changes: 6 additions & 10 deletions gemfiles/4.0.gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'activerecord', '~> 4.0.0'
gem 'appraisal', :group => :test
gem 'bundler', '~> 1.17.3', :group => :test
gem 'i18n', '~> 0.6.5'
gem 'minitest', :group => :test
gem 'rake', '~> 10.4', :group => :test
gem 'sqlite3', '~> 1.3.13', :group => :test
gem "activerecord", "~> 4.0.0"
gem "appraisal", group: :test
gem "minitest", group: :test
gem "sqlite3", "~> 1.3.13", group: :test
gem "i18n", "~> 0.6.5", group: :test
16 changes: 6 additions & 10 deletions gemfiles/4.1.gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'activerecord', '~> 4.1.0'
gem 'appraisal', :group => :test
gem 'bundler', '~> 1.17.3', :group => :test
gem 'i18n', '~> 0.6.9'
gem 'minitest', :group => :test
gem 'rake', '~> 10.4', :group => :test
gem 'sqlite3', '~> 1.3.13', :group => :test
gem "activerecord", "~> 4.1.0"
gem "appraisal", group: :test
gem "minitest", group: :test
gem "sqlite3", "~> 1.3.13", group: :test
gem "i18n", "~> 0.6.9", group: :test
16 changes: 6 additions & 10 deletions gemfiles/4.2.gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'activerecord', '~> 4.2.3'
gem 'appraisal', :group => :test
gem 'bundler', '~> 1.17.3', :group => :test
gem 'i18n', '~> 0.7.0'
gem 'minitest', :group => :test
gem 'rake', '~> 10.4', :group => :test
gem 'sqlite3', '~> 1.3.13', :group => :test
gem "activerecord", "~> 4.2.3"
gem "appraisal", group: :test
gem "minitest", group: :test
gem "sqlite3", "~> 1.3.13", group: :test
gem "i18n", "~> 0.7.0", group: :test
16 changes: 6 additions & 10 deletions gemfiles/5.0.gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'activerecord', '~> 5.0.0'
gem 'appraisal', :group => :test
gem 'bundler', '~> 1.17.3', :group => :test
gem 'i18n', '~> 0.7.0'
gem 'minitest', :group => :test
gem 'rake', '~> 10.4', :group => :test
gem 'sqlite3', '~> 1.3.13', :group => :test
gem "activerecord", "~> 5.0.0"
gem "appraisal", group: :test
gem "minitest", group: :test
gem "sqlite3", "~> 1.3.13", group: :test
gem "i18n", "~> 0.7.0", group: :test
16 changes: 6 additions & 10 deletions gemfiles/5.1.gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'activerecord', '~> 5.1.0'
gem 'appraisal', :group => :test
gem 'bundler', '~> 1.17.3', :group => :test
gem 'i18n', '~> 0.7.0'
gem 'minitest', :group => :test
gem 'rake', '~> 10.4', :group => :test
gem 'sqlite3', '~> 1.3.13', :group => :test
gem "activerecord", "~> 5.1.0"
gem "appraisal", group: :test
gem "minitest", group: :test
gem "sqlite3", "~> 1.3.13", group: :test
gem "i18n", "~> 0.7.0", group: :test
16 changes: 6 additions & 10 deletions gemfiles/5.2.gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'activerecord', '~> 5.2.0'
gem 'appraisal', :group => :test
gem 'bundler', '~> 1.17.3', :group => :test
gem 'i18n', '~> 0.7.0'
gem 'minitest', :group => :test
gem 'rake', '~> 10.4', :group => :test
gem 'sqlite3', '~> 1.3.13', :group => :test
gem "activerecord", "~> 5.2.0"
gem "appraisal", group: :test
gem "minitest", group: :test
gem "sqlite3", "~> 1.3.13"
gem "i18n", "~> 0.7.0"
14 changes: 5 additions & 9 deletions gemfiles/6.0.gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'activerecord', '~> 6.0.0'
gem 'appraisal', :group => :test
gem 'bundler', '~> 1.17.3', :group => :test
gem 'minitest', :group => :test
gem 'rake', '~> 10.4', :group => :test
gem 'sqlite3', '~> 1.4.1'
gem "activerecord", "~> 6.0.0"
gem "appraisal", group: :test
gem "minitest", group: :test
gem "sqlite3", "~> 1.4.1", group: :test
12 changes: 5 additions & 7 deletions gemfiles/7.0.gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'activerecord', '~> 7.0.0'
gem 'bundler', '~> 1.17.3', group: :test
gem 'rake', '~> 12.3', group: :test
gem 'appraisal', group: :test
gem 'minitest', group: :test
gem 'sqlite3', '~> 1.4.2'
gem "activerecord", "~> 7.0.0"
gem "appraisal", group: :test
gem "minitest", group: :test
gem "sqlite3", "~> 1.4.1", group: :test
Loading

0 comments on commit 27c5a4a

Please sign in to comment.