Skip to content

Commit 86aed8a

Browse files
authored
Merge pull request #462 from willnet/add-ruby-3-4-and-rails-7-2-and-8-0
Add Rails7.2, 8.0 and Ruby 3.4 to CI matrix
2 parents 18ef8b6 + 515f862 commit 86aed8a

File tree

3 files changed

+34
-19
lines changed

3 files changed

+34
-19
lines changed

.github/workflows/CI.yml

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,37 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
active_record:
17-
- '6.0'
18-
- '6.1'
19-
- '7.0'
20-
- '7.1'
21-
ruby:
22-
- '2.7'
23-
- '3.0'
24-
- '3.1'
25-
- '3.2'
2616
include:
27-
- active_record: '5.1'
28-
ruby: '2.7'
29-
- active_record: '5.2'
30-
ruby: '2.7'
31-
- active_record: '7.1'
32-
ruby: '3.3'
17+
- { active_record: '5.1', ruby: '2.7' }
18+
- { active_record: '5.2', ruby: '2.7' }
19+
- { active_record: '6.0', ruby: '2.7' }
20+
- { active_record: '6.0', ruby: '3.0' }
21+
- { active_record: '6.0', ruby: '3.1' }
22+
- { active_record: '6.0', ruby: '3.2' }
23+
- { active_record: '6.1', ruby: '2.7' }
24+
- { active_record: '6.1', ruby: '3.0' }
25+
- { active_record: '6.1', ruby: '3.1' }
26+
- { active_record: '6.1', ruby: '3.2' }
27+
- { active_record: '7.0', ruby: '2.7' }
28+
- { active_record: '7.0', ruby: '3.0' }
29+
- { active_record: '7.0', ruby: '3.1' }
30+
- { active_record: '7.0', ruby: '3.2' }
31+
- { active_record: '7.1', ruby: '2.7' }
32+
- { active_record: '7.1', ruby: '3.0' }
33+
- { active_record: '7.1', ruby: '3.1' }
34+
- { active_record: '7.1', ruby: '3.2' }
35+
- { active_record: '7.1', ruby: '3.3' }
36+
- { active_record: '7.2', ruby: '3.1' }
37+
- { active_record: '7.2', ruby: '3.2' }
38+
- { active_record: '7.2', ruby: '3.3' }
39+
- { active_record: '7.2', ruby: '3.4' }
40+
- { active_record: '8.0', ruby: '3.2' }
41+
- { active_record: '8.0', ruby: '3.3' }
42+
- { active_record: '8.0', ruby: '3.4' }
3343
env:
3444
ACTIVERECORD: ${{ matrix.active_record }}
3545
steps:
36-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v4
3747
- name: Set up Ruby
3848
uses: ruby/setup-ruby@v1
3949
with:

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
source 'https://rubygems.org'
22

33
gemspec
4+
5+
gem "concurrent-ruby", "< 1.3.5"

attr_encrypted.gemspec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@ Gem::Specification.new do |s|
4242
s.add_development_dependency('activerecord-jdbcsqlite3-adapter')
4343
s.add_development_dependency('jdbc-sqlite3', '< 3.8.7') # 3.8.7 is nice and broke
4444
else
45-
s.add_development_dependency('sqlite3', '= 1.5.4')
45+
if ENV['ACTIVERECORD'] && Gem::Version.new(ENV['ACTIVERECORD']) >= Gem::Version.new('8.0')
46+
s.add_development_dependency('sqlite3', '> 2.1.0')
47+
else
48+
s.add_development_dependency('sqlite3', '= 1.5.4')
49+
end
4650
end
47-
s.add_development_dependency('dm-sqlite-adapter')
4851
s.add_development_dependency('pry')
4952
s.add_development_dependency('simplecov')
5053
s.add_development_dependency('simplecov-rcov')

0 commit comments

Comments
 (0)