Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for activerecord 8.0 #487

Merged
merged 1 commit into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 110 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,35 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ['2.6', '2.7', '3.0', '3.1', '3.2']
ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'head']
gemfile:
- rails_5_2
- rails_6_0
- rails_6_1
- rails_7_0
- rails_7_1
- rails_7_2
- rails_8_0
- rails_main
exclude:
- ruby: 'head'
gemfile: rails_6_1

- ruby: 'head'
gemfile: rails_6_0

- ruby: 'head'
gemfile: rails_5_2

- ruby: '3.3'
gemfile: rails_6_1

- ruby: '3.3'
gemfile: rails_6_0

- ruby: '3.3'
gemfile: rails_5_2

- ruby: '3.2'
gemfile: rails_6_0

Expand All @@ -37,7 +56,7 @@ jobs:
- ruby: '3.0'
gemfile: rails_5_2

# Rails 7.2 requires Ruby 3.1 or higher
# Rails 8.1 requires Ruby 3.2 or higher
- ruby: '2.6'
gemfile: rails_main

Expand All @@ -47,6 +66,9 @@ jobs:
- ruby: '3.0'
gemfile: rails_main

- ruby: '3.1'
gemfile: rails_main

- ruby: '2.6'
gemfile: rails_7_0

Expand All @@ -61,6 +83,19 @@ jobs:

- ruby: '3.0'
gemfile: rails_7_2

- ruby: '2.6'
gemfile: rails_8_0

- ruby: '2.7'
gemfile: rails_8_0

- ruby: '3.0'
gemfile: rails_8_0

- ruby: '3.1'
gemfile: rails_8_0

env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
BUNDLE_PATH_RELATIVE_TO_CWD: true
Expand All @@ -86,16 +121,35 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ['2.6', '2.7', '3.0', '3.1']
ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'head']
gemfile:
- rails_5_2
- rails_6_0
- rails_6_1
- rails_7_0
- rails_7_1
- rails_7_2
- rails_8_0
- rails_main
exclude:
- ruby: 'head'
gemfile: rails_6_1

- ruby: 'head'
gemfile: rails_6_0

- ruby: 'head'
gemfile: rails_5_2

- ruby: '3.3'
gemfile: rails_6_1

- ruby: '3.3'
gemfile: rails_6_0

- ruby: '3.3'
gemfile: rails_5_2

- ruby: '3.2'
gemfile: rails_6_0

Expand All @@ -108,7 +162,7 @@ jobs:
- ruby: '3.0'
gemfile: rails_5_2

# Rails 8 requires Ruby 3.1 or higher
# Rails 8.1 requires Ruby 3.2 or higher
- ruby: '2.6'
gemfile: rails_main

Expand All @@ -118,6 +172,9 @@ jobs:
- ruby: '3.0'
gemfile: rails_main

- ruby: '3.1'
gemfile: rails_main

- ruby: '2.6'
gemfile: rails_7_0

Expand All @@ -132,6 +189,19 @@ jobs:

- ruby: '3.0'
gemfile: rails_7_2

- ruby: '2.6'
gemfile: rails_8_0

- ruby: '2.7'
gemfile: rails_8_0

- ruby: '3.0'
gemfile: rails_8_0

- ruby: '3.1'
gemfile: rails_8_0

env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
BUNDLE_PATH_RELATIVE_TO_CWD: true
Expand Down Expand Up @@ -172,16 +242,35 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ['2.6', '2.7', '3.0', '3.1', '3.2']
ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'head']
gemfile:
- rails_5_2
- rails_6_0
- rails_6_1
- rails_7_0
- rails_7_1
- rails_7_2
- rails_8_0
- rails_main
exclude:
- ruby: 'head'
gemfile: rails_6_1

- ruby: 'head'
gemfile: rails_6_0

- ruby: 'head'
gemfile: rails_5_2

- ruby: '3.3'
gemfile: rails_6_1

- ruby: '3.3'
gemfile: rails_6_0

- ruby: '3.3'
gemfile: rails_5_2

- ruby: '3.2'
gemfile: rails_6_0

Expand All @@ -194,7 +283,7 @@ jobs:
- ruby: '3.0'
gemfile: rails_5_2

# Rails 8 requires Ruby 3.1 or higher
# Rails 8.1 requires Ruby 3.2 or higher
- ruby: '2.6'
gemfile: rails_main

Expand All @@ -204,6 +293,9 @@ jobs:
- ruby: '3.0'
gemfile: rails_main

- ruby: '3.1'
gemfile: rails_main

- ruby: '2.6'
gemfile: rails_7_0

Expand All @@ -218,6 +310,18 @@ jobs:

- ruby: '3.0'
gemfile: rails_7_2

- ruby: '2.6'
gemfile: rails_8_0

- ruby: '2.7'
gemfile: rails_8_0

- ruby: '3.0'
gemfile: rails_8_0

- ruby: '3.1'
gemfile: rails_8_0
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
BUNDLE_PATH_RELATIVE_TO_CWD: true
Expand Down
10 changes: 8 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,20 @@
"6_1" => "6.1.0",
"7_0" => "7.0.0",
"7_1" => "7.1.0",
"7_2" => "7.2.0"
"7_2" => "7.2.0",
"8_0" => "8.0.0.rc1"
}.each do |rails, version|
appraise "rails-#{rails}" do
gem "rails", "~> #{version}"
if rails == "7_0"
gem "base64"
gem "bigdecimal"
gem "drb"
gem "mutex_m"
end
end
end

appraise "rails-main" do
gem "rails", github: "rails/rails", branch: "main"
gem "rspec-rails", "~> 6.0.2"
end
4 changes: 2 additions & 2 deletions awesome_nested_set.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ Gem::Specification.new do |s|

s.required_ruby_version = '>= 2.0.0'

s.add_runtime_dependency 'activerecord', '>= 4.0.0', '< 8.0'
s.add_runtime_dependency 'activerecord', '>= 4.0.0', '< 8.1'

s.add_development_dependency 'appraisal'
s.add_development_dependency 'database_cleaner'
s.add_development_dependency 'pry'
s.add_development_dependency 'pry-nav'
s.add_development_dependency 'rake', '~> 13'
s.add_development_dependency 'rspec-rails', '>= 4.0.0', '<= 6.2'
s.add_development_dependency 'rspec-rails', '>= 4.0.0', '< 8.0'

s.cert_chain = [File.expand_path('certs/parndt.pem', __dir__)]
if $PROGRAM_NAME =~ /gem\z/ && ARGV.include?('build') && ARGV.include?(__FILE__)
Expand Down
4 changes: 4 additions & 0 deletions gemfiles/rails_7_0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
source "https://rubygems.org"

gem "rails", "~> 7.0.0"
gem "base64"
gem "bigdecimal"
gem "drb"
gem "mutex_m"

platforms :ruby do
gem "sqlite3", "~> 1.4"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ source "https://rubygems.org"
gem "rails", "~> 7.2.0"

platforms :ruby do
gem "sqlite3"
gem "mysql2", "< 1.0.0"
gem "pg", "< 2.0.0"
gem "sqlite3"
end

gemspec path: "../"
13 changes: 13 additions & 0 deletions gemfiles/rails_8_0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 8.0.0.rc1"

platforms :ruby do
gem "sqlite3"
gem "mysql2", "< 1.0.0"
gem "pg", "< 2.0.0"
end

gemspec path: "../"
1 change: 0 additions & 1 deletion gemfiles/rails_main.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
source "https://rubygems.org"

gem "rails", github: "rails/rails", branch: "main"
gem "rspec-rails", "~> 6.0.2"

platforms :ruby do
gem "sqlite3"
Expand Down
Loading