Skip to content

Commit 66a78f4

Browse files
committed
Make rails 8 work... maybe
1 parent dfd99fc commit 66a78f4

File tree

7 files changed

+54
-13
lines changed

7 files changed

+54
-13
lines changed

.github/workflows/ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ jobs:
7070
- ruby: "3.3"
7171
rails: "6.1.0"
7272
env:
73-
SQLITE3_VERSION: 1.4.1
7473
REDIS_URL: redis://localhost:6379/0
7574
CI: true
7675
RAILS_VERSION: ${{ matrix.rails }}

.github/workflows/examples.yml

+17-4
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,31 @@ jobs:
88
services:
99
redis:
1010
image: redis
11-
ports: ['6379:6379']
11+
ports: ["6379:6379"]
1212
options: >-
1313
--health-cmd "redis-cli ping"
1414
--health-interval 10s
1515
--health-timeout 5s
1616
--health-retries 5
1717
strategy:
1818
matrix:
19-
ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
20-
rails: ['5.2', '6.0.0', '6.1.0', '7.0.0', '7.1.0']
19+
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
20+
rails: ["5.2", "6.0.0", "6.1.0", "7.0.0", "7.1.0", "7.2.0", "8.0.0"]
2121
exclude:
22+
- ruby: "2.6"
23+
rails: "8.0.0"
24+
- ruby: "2.7"
25+
rails: "8.0.0"
26+
- ruby: "3.0"
27+
rails: "8.0.0"
28+
- ruby: "3.1"
29+
rails: "8.0.0"
30+
- ruby: "2.6"
31+
rails: "7.2.0"
32+
- ruby: "2.7"
33+
rails: "7.2.0"
34+
- ruby: "3.0"
35+
rails: "7.2.0"
2236
- ruby: "2.6"
2337
rails: "7.1.0"
2438
- ruby: "2.6"
@@ -44,7 +58,6 @@ jobs:
4458
- ruby: "3.3"
4559
rails: "6.1.0"
4660
env:
47-
SQLITE3_VERSION: 1.4.1
4861
REDIS_URL: redis://localhost:6379/0
4962
CI: true
5063
RAILS_VERSION: ${{ matrix.rails }}

Gemfile

+14-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,26 @@ Dir['flipper-*.gemspec'].each do |gemspec|
66
gemspec(name: "flipper-#{plugin}", development_group: plugin)
77
end
88

9+
rails_version = ENV['RAILS_VERSION'] || '8.0'
10+
sqlite3_version = ENV['SQLITE3_VERSION'] || case rails_version
11+
when /8\.\d+/
12+
'2.1.0'
13+
when /7\.\d+/
14+
'1.4.1'
15+
when /6\.\d+/
16+
'1.4.1'
17+
when /5\.\d+/
18+
'1.3.11'
19+
end
20+
921
gem 'debug'
1022
gem 'rake'
1123
gem 'statsd-ruby', '~> 1.2.1'
1224
gem 'rspec', '~> 3.0'
1325
gem 'rack-test'
1426
gem 'rackup'
15-
gem 'sqlite3', "~> #{ENV['SQLITE3_VERSION'] || '1.4.1'}"
16-
gem 'rails', "~> #{ENV['RAILS_VERSION'] || '7.1'}"
27+
gem 'sqlite3', "~> #{sqlite3_version}"
28+
gem 'rails', "~> #{rails_version}"
1729
gem 'minitest', '~> 5.18'
1830
gem 'minitest-documentation'
1931
gem 'webmock'

flipper-active_record.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ Gem::Specification.new do |gem|
3232
gem.metadata = Flipper::METADATA
3333

3434
gem.add_dependency 'flipper', "~> #{Flipper::VERSION}"
35-
gem.add_dependency 'activerecord', '>= 4.2', '< 8'
35+
gem.add_dependency 'activerecord', '>= 4.2', '< 9'
3636
end

flipper-active_support_cache_store.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ Gem::Specification.new do |gem|
2121
gem.metadata = Flipper::METADATA
2222

2323
gem.add_dependency 'flipper', "~> #{Flipper::VERSION}"
24-
gem.add_dependency 'activesupport', '>= 4.2', '< 8'
24+
gem.add_dependency 'activesupport', '>= 4.2', '< 9'
2525
end

script/test

+20-4
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,37 @@ cd $(dirname "$0")/..
1313
}
1414

1515
export RAILS_VERSION=5.0.0
16-
export SQLITE3_VERSION=1.3.11
1716
script/bootstrap || bundle update
1817
bundle exec rake
1918

2019
export RAILS_VERSION=5.1.4
21-
export SQLITE3_VERSION=1.3.11
2220
script/bootstrap || bundle update
2321
bundle exec rake
2422

2523
export RAILS_VERSION=5.2.3
26-
export SQLITE3_VERSION=1.3.11
2724
script/bootstrap || bundle update
2825
bundle exec rake
2926

3027
export RAILS_VERSION=6.0.0
31-
export SQLITE3_VERSION=1.4.1
28+
script/bootstrap || bundle update
29+
bundle exec rake
30+
31+
export RAILS_VERSION=6.1.0
32+
script/bootstrap || bundle update
33+
bundle exec rake
34+
35+
export RAILS_VERSION=7.0.0
36+
script/bootstrap || bundle update
37+
bundle exec rake
38+
39+
export RAILS_VERSION=7.1.0
40+
script/bootstrap || bundle update
41+
bundle exec rake
42+
43+
export RAILS_VERSION=7.2.0
44+
script/bootstrap || bundle update
45+
bundle exec rake
46+
47+
export RAILS_VERSION=8.0.0
3248
script/bootstrap || bundle update
3349
bundle exec rake

test_rails/system/test_help_test.rb

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
require "capybara/cuprite"
77
require "flipper"
88
require "flipper/test_help"
9+
require "action_controller/railtie"
910

1011
require 'action_dispatch/system_testing/server'
1112
ActionDispatch::SystemTesting::Server.silence_puma = true

0 commit comments

Comments
 (0)