Skip to content

Commit 12d69ac

Browse files
authored
Merge pull request reidmorrison#173 from petergoldstein/feature/add_ruby_3_2_to_ci
Add Ruby 3.2 to the CI matrix, fixes other CI issues
2 parents c3cb086 + 9f028d3 commit 12d69ac

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- rails: 5.2
2121
ruby: 2.6
2222
- rails: 5.2
23-
ruby: jruby
23+
ruby: jruby-9.3
2424

2525
- rails: "6.0"
2626
ruby: 2.6
@@ -35,19 +35,20 @@ jobs:
3535
ruby: jruby
3636

3737
- rails: "7.0"
38-
ruby: 3.1
39-
- rails: "6.1"
40-
ruby: jruby
41-
38+
ruby: "3.0"
4239
- rails: "7.0"
4340
ruby: 3.1
41+
- rails: "7.0"
42+
ruby: 3.2
43+
- rails: "7.0"
44+
ruby: jruby
4445

4546
env:
4647
BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
4748
DISPLAY: ":99.0"
4849

4950
steps:
50-
- uses: actions/checkout@v2
51+
- uses: actions/checkout@v3
5152
- name: Set up Ruby
5253
uses: ruby/setup-ruby@v1
5354
with:

Appraisals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ appraise "rails_7.0" do
2828
gem "thread_safe", "~> 0.3.6"
2929

3030
gem "rails", "~> 7.0.0"
31-
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0", platform: :jruby
31+
gem "activerecord-jdbcsqlite3-adapter", "~> 70.0", platform: :jruby
3232
gem "sqlite3", "~> 1.4.0", platform: :ruby
3333
end

gemfiles/rails_7.0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ gem "semantic_logger", github: "reidmorrison/semantic_logger"
1414
gem "rails", "~> 7.0.0"
1515
gem "sqlite3", "~> 1.4.0", platform: :ruby
1616
gem "thread_safe", "~> 0.3.6"
17-
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0", platform: :jruby
17+
gem "activerecord-jdbcsqlite3-adapter", "~> 70.0", platform: :jruby
1818

1919
group :development do
2020
gem "rubocop"

0 commit comments

Comments
 (0)