Skip to content

Commit ef5ad48

Browse files
authored
Merge branch 'main' into feat/ciphers-opt-support
2 parents 1713f7a + 0163760 commit ef5ad48

File tree

5 files changed

+30
-14
lines changed

5 files changed

+30
-14
lines changed

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "bundler"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
lint:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1919

20-
- name: Set up Ruby 2.7
20+
- name: Set up Ruby 3.x
2121
uses: ruby/setup-ruby@v1
2222
with:
23-
ruby-version: 2.7
23+
ruby-version: 3
2424
bundler-cache: true
2525

2626
- name: Rubocop
@@ -31,10 +31,10 @@ jobs:
3131
runs-on: ubuntu-latest
3232
strategy:
3333
matrix:
34-
ruby: ['2.6', '2.7', '3.0', '3.1']
34+
ruby: ['3.0', '3.1', '3.2', '3.3']
3535

3636
steps:
37-
- uses: actions/checkout@v2
37+
- uses: actions/checkout@v4
3838

3939
- name: Set up Ruby
4040
uses: ruby/setup-ruby@v1

.github/workflows/publish.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,20 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414

1515
- name: Set up Ruby 2.7
16-
uses: actions/setup-ruby@v1
16+
uses: ruby/setup-ruby@v1
1717
with:
18-
ruby-version: 2.7.x
18+
ruby-version: 2.7
1919

2020
- name: Publish to RubyGems
21-
uses: dawidd6/action-publish-gem@v1
22-
with:
23-
api_key: ${{secrets.RUBYGEMS_AUTH_TOKEN}}
21+
run: |
22+
mkdir -p $HOME/.gem
23+
touch $HOME/.gem/credentials
24+
chmod 0600 $HOME/.gem/credentials
25+
printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
26+
gem build faraday-httpclient.gemspec
27+
gem push faraday-httpclient-*.gem
28+
env:
29+
GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ gemspec
55

66
gem 'rake', '~> 13.0'
77
gem 'rspec', '~> 3.0'
8-
gem 'simplecov', '~> 0.19.0'
8+
gem 'simplecov', '~> 0.22.0'
99

1010
gem 'webmock', '~> 3.4'
1111

1212
less_than_ruby_v27 = Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0')
1313
gem 'rubocop', less_than_ruby_v27 ? '~> 1.12.0' : '~> 1.66.0'
1414
gem 'rubocop-packaging', '~> 0.5'
15-
gem 'rubocop-performance', '~> 1.0'
15+
gem 'rubocop-performance', '~> 1.20'

lib/faraday/adapter/httpclient.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def call(env)
4848

4949
if (req = env[:request]).stream_response?
5050
warn "Streaming downloads for #{self.class.name} " \
51-
'are not yet implemented.'
51+
'are not yet implemented.'
5252
req.on_data.call(resp.body, resp.body.bytesize)
5353
end
5454
save_response env, resp.status, resp.body, resp.headers, resp.reason

0 commit comments

Comments
 (0)