Skip to content

Commit 1155c26

Browse files
authored
ci: test against a compatible connection_pool version (#706)
1 parent 4a021df commit 1155c26

9 files changed

+19
-158
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,17 @@ jobs:
3535
- dalli3
3636
- redis_5
3737
- redis_4
38-
- connection_pool_dalli
3938
- active_support_8_1_redis_cache_store
40-
- active_support_8_1_redis_cache_store_pooled
4139
- active_support_8_0_redis_cache_store
42-
- active_support_8_0_redis_cache_store_pooled
4340
- active_support_7_2_redis_cache_store
44-
- active_support_7_2_redis_cache_store_pooled
4541
- active_support_7_1_redis_cache_store
46-
- active_support_7_1_redis_cache_store_pooled
4742
- active_support_7_0_redis_cache_store
48-
- active_support_7_0_redis_cache_store_pooled
4943
- redis_store
5044
exclude:
5145
- gemfile: rails_7_0
5246
ruby: '3.4'
5347
- gemfile: active_support_7_0_redis_cache_store
5448
ruby: '3.4'
55-
- gemfile: active_support_7_0_redis_cache_store_pooled
56-
ruby: '3.4'
5749
- gemfile: rails_7_2
5850
ruby: '3.0'
5951
- gemfile: rails_7_2
@@ -62,10 +54,6 @@ jobs:
6254
ruby: '3.0'
6355
- gemfile: active_support_7_2_redis_cache_store
6456
ruby: '2.7'
65-
- gemfile: active_support_7_2_redis_cache_store_pooled
66-
ruby: '3.0'
67-
- gemfile: active_support_7_2_redis_cache_store_pooled
68-
ruby: '2.7'
6957
- gemfile: rails_8_0
7058
ruby: '3.1'
7159
- gemfile: rails_8_0
@@ -78,12 +66,6 @@ jobs:
7866
ruby: '3.0'
7967
- gemfile: active_support_8_0_redis_cache_store
8068
ruby: '2.7'
81-
- gemfile: active_support_8_0_redis_cache_store_pooled
82-
ruby: '3.1'
83-
- gemfile: active_support_8_0_redis_cache_store_pooled
84-
ruby: '3.0'
85-
- gemfile: active_support_8_0_redis_cache_store_pooled
86-
ruby: '2.7'
8769
- gemfile: rails_8_1
8870
ruby: '3.1'
8971
- gemfile: rails_8_1
@@ -96,12 +78,6 @@ jobs:
9678
ruby: '3.0'
9779
- gemfile: active_support_8_1_redis_cache_store
9880
ruby: '2.7'
99-
- gemfile: active_support_8_1_redis_cache_store_pooled
100-
ruby: '3.1'
101-
- gemfile: active_support_8_1_redis_cache_store_pooled
102-
ruby: '3.0'
103-
- gemfile: active_support_8_1_redis_cache_store_pooled
104-
ruby: '2.7'
10581
env:
10682
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
10783
steps:

Appraisals

Lines changed: 16 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -8,98 +8,63 @@ appraise "rack_2" do
88
gem "rack", "~> 2.0"
99
end
1010

11-
appraise 'rails_8-1' do
12-
gem 'railties', '~> 8.1.0'
11+
appraise "rails_8-1" do
12+
gem "railties", "~> 8.1.0"
1313
end
1414

15-
appraise 'rails_8-0' do
16-
gem 'railties', '~> 8.0.0'
15+
appraise "rails_8-0" do
16+
gem "railties", "~> 8.0.0"
1717
end
1818

19-
appraise 'rails_7-2' do
20-
gem 'railties', '~> 7.2.0'
19+
appraise "rails_7-2" do
20+
gem "railties", "~> 7.2.0"
2121
end
2222

23-
appraise 'rails_7-1' do
24-
gem 'railties', '~> 7.1.0'
23+
appraise "rails_7-1" do
24+
gem "railties", "~> 7.1.0"
2525
end
2626

27-
appraise 'rails_7-0' do
28-
gem 'railties', '~> 7.0.0'
27+
appraise "rails_7-0" do
28+
gem "railties", "~> 7.0.0"
2929
end
3030

31-
appraise 'dalli3' do
32-
gem 'dalli', '~> 3.0'
31+
appraise "dalli3" do
32+
gem "dalli", "~> 3.0"
3333
end
3434

35-
appraise 'redis_5' do
36-
gem 'redis', '~> 5.0'
35+
appraise "redis_5" do
36+
gem "redis", "~> 5.0"
3737
end
3838

39-
appraise 'redis_4' do
40-
gem 'redis', '~> 4.0'
41-
end
42-
43-
appraise "connection_pool_dalli" do
44-
gem "connection_pool", "~> 2.2"
45-
gem "dalli", "~> 3.0"
39+
appraise "redis_4" do
40+
gem "redis", "~> 4.0"
4641
end
4742

4843
appraise "active_support_8-1_redis_cache_store" do
4944
gem "activesupport", "~> 8.1.0"
5045
gem "redis", "~> 5.0"
5146
end
5247

53-
appraise "active_support_8-1_redis_cache_store_pooled" do
54-
gem "activesupport", "~> 8.1.0"
55-
gem "connection_pool", "~> 2.2"
56-
gem "redis", "~> 5.0"
57-
end
58-
5948
appraise "active_support_8-0_redis_cache_store" do
6049
gem "activesupport", "~> 8.0.0"
6150
gem "redis", "~> 5.0"
6251
end
6352

64-
appraise "active_support_8-0_redis_cache_store_pooled" do
65-
gem "activesupport", "~> 8.0.0"
66-
gem "connection_pool", "~> 2.2"
67-
gem "redis", "~> 5.0"
68-
end
69-
7053
appraise "active_support_7-2_redis_cache_store" do
7154
gem "activesupport", "~> 7.2.0"
7255
gem "redis", "~> 5.0"
7356
end
7457

75-
appraise "active_support_7-2_redis_cache_store_pooled" do
76-
gem "activesupport", "~> 7.2.0"
77-
gem "connection_pool", "~> 2.2"
78-
gem "redis", "~> 5.0"
79-
end
80-
8158
appraise "active_support_7-1_redis_cache_store" do
8259
gem "activesupport", "~> 7.1.0"
8360
gem "redis", "~> 5.0"
8461
end
8562

86-
appraise "active_support_7-1_redis_cache_store_pooled" do
87-
gem "activesupport", "~> 7.1.0"
88-
gem "connection_pool", "~> 2.2"
89-
gem "redis", "~> 5.0"
90-
end
91-
9263
appraise "active_support_7-0_redis_cache_store" do
9364
gem "activesupport", "~> 7.0.0"
9465
gem "redis", "~> 5.0"
9566
end
9667

97-
appraise "active_support_7-0_redis_cache_store_pooled" do
98-
gem "activesupport", "~> 7.0.0"
99-
gem "connection_pool", "~> 2.2"
100-
gem "redis", "~> 5.0"
101-
end
102-
10368
appraise "redis_store" do
10469
gem "redis-store", "~> 1.5"
10570
end

gemfiles/active_support_7_0_redis_cache_store_pooled.gemfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

gemfiles/active_support_7_1_redis_cache_store_pooled.gemfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

gemfiles/active_support_7_2_redis_cache_store_pooled.gemfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

gemfiles/active_support_8_0_redis_cache_store_pooled.gemfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

gemfiles/active_support_8_1_redis_cache_store_pooled.gemfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

gemfiles/connection_pool_dalli.gemfile

Lines changed: 0 additions & 13 deletions
This file was deleted.

rack-attack.gemspec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,7 @@ Gem::Specification.new do |s|
4646
end
4747

4848
s.add_development_dependency "activesupport"
49+
# Fix activesupport Direct version requirement on connection_pool
50+
# can be removed once https://github.com/rails/rails/issues/56291 is ixed and released
51+
s.add_development_dependency "connection_pool", "~> 2.5"
4952
end

0 commit comments

Comments
 (0)