Skip to content

Commit 0fa7b01

Browse files
committed
Merge branch 'rails-8'
2 parents ded8772 + 3afdefd commit 0fa7b01

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,34 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
32-
rails: ['5.2', '6.0.0', '6.1.0', '7.0.0', '7.1.0']
32+
rails: ['5.2', '6.0.0', '6.1.0', '7.0.0', '7.1.0', '7.2.0', '8.0.0']
3333
exclude:
3434
- ruby: "2.6"
3535
rails: "7.1.0"
3636
- ruby: "2.6"
3737
rails: "7.0.0"
38+
- ruby: "2.6"
39+
rails: "7.2.0"
40+
- ruby: "2.6"
41+
rails: "8.0.0"
3842
- ruby: "2.7"
3943
rails: "7.1.0"
44+
- ruby: "2.7"
45+
rails: "7.2.0"
46+
- ruby: "2.7"
47+
rails: "8.0.0"
4048
- ruby: "3.0"
4149
rails: "5.2"
50+
- ruby: "3.0"
51+
rails: "7.2.0"
52+
- ruby: "3.0"
53+
rails: "8.0.0"
4254
- ruby: "3.1"
4355
rails: "5.2"
4456
- ruby: "3.1"
4557
rails: "6.0.0"
58+
- ruby: "3.1"
59+
rails: "8.0.0"
4660
- ruby: "3.2"
4761
rails: "5.2"
4862
- ruby: "3.2"
@@ -56,7 +70,7 @@ jobs:
5670
- ruby: "3.3"
5771
rails: "6.1.0"
5872
env:
59-
SQLITE3_VERSION: 1.4.1
73+
SQLITE3_VERSION: ${{ matrix.rails == '8.0.0' && '2.1.0' || '1.4.1' }}
6074
REDIS_URL: redis://localhost:6379/0
6175
CI: true
6276
RAILS_VERSION: ${{ matrix.rails }}

flipper-active_record.gemspec

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

test_rails/system/test_help_test.rb

Lines changed: 1 addition & 0 deletions
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)