Skip to content

Commit f3dfe31

Browse files
committed
Support for Ruby 4.0 and reintroduced Ruby 3.1 CI for now
1 parent b4b14eb commit f3dfe31

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

.github/workflows/cicd.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,14 @@ jobs:
3535
runs-on: ubuntu-latest
3636
strategy:
3737
matrix:
38-
ruby-version: ['3.2', '3.3', '3.4', '4.0', 'jruby-10.0.2.0']
38+
ruby-version: ['3.1', '3.2', '3.3', '3.4', '4.0', 'jruby-10.0.2.0']
3939
rails-version: ['rails-7.1', 'rails-7.2', 'rails-8.0', 'rails-8.1']
4040
exclude:
41+
# Rails 8 requires Ruby 3.2+
42+
- ruby-version: '3.1'
43+
rails-version: 'rails-8.0'
44+
- ruby-version: '3.1'
45+
rails-version: 'rails-8.1'
4146
# JRuby only supports up to 7.1 right now
4247
- ruby-version: 'jruby-10.0.2.0'
4348
rails-version: 'rails-8.1'
@@ -90,6 +95,7 @@ jobs:
9095
fail_ci_if_error: false
9196

9297
- name: Run the test suite with Faraday v1
98+
if: matrix.ruby-version != '4.0'
9399
run: |
94100
FARADAY_VERSION=1.10.3 bundle install
95101
bundle exec appraisal ${{ matrix.rails-version }} bundle install

ruby_llm.gemspec

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,15 @@ Gem::Specification.new do |spec|
4242
# Runtime dependencies
4343
spec.add_dependency 'base64'
4444
spec.add_dependency 'event_stream_parser', '~> 1'
45-
spec.add_dependency 'faraday', ENV['FARADAY_VERSION'] || '>= 1.10.0'
45+
if Gem::Version.new(Gem.ruby_version) >= Gem::Version.new('4.0')
46+
spec.add_dependency 'faraday', '>= 2.0'
47+
spec.add_dependency 'faraday-retry', '>= 2.0'
48+
else
49+
spec.add_dependency 'faraday', ENV['FARADAY_VERSION'] || '>= 1.10.0'
50+
spec.add_dependency 'faraday-retry', '>= 1'
51+
end
4652
spec.add_dependency 'faraday-multipart', '>= 1'
4753
spec.add_dependency 'faraday-net_http', '>= 1'
48-
spec.add_dependency 'faraday-retry', '>= 1'
4954
spec.add_dependency 'marcel', '~> 1.0'
5055
spec.add_dependency 'ruby_llm-schema', '~> 0.2.1'
5156
spec.add_dependency 'zeitwerk', '~> 2'

0 commit comments

Comments
 (0)