From 411674966868fd34bc94578310441ea6a12a543d Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Fri, 16 Aug 2024 13:59:21 +0200 Subject: [PATCH 1/7] CI: Add Ruby 3.3 --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd0938f..34ead94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Ruby 2.7 uses: ruby/setup-ruby@v1 @@ -33,10 +33,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby: ['2.6', '2.7', '3.0', '3.1', '3.2'] + ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Ruby uses: ruby/setup-ruby@v1 @@ -45,5 +45,4 @@ jobs: bundler-cache: true - name: Test - run: | - bundle exec rake + run: bundle exec rake From 57fe305d3cbe0a83767a3c22906eae7518452134 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Fri, 16 Aug 2024 14:01:48 +0200 Subject: [PATCH 2/7] CI: Try using standardrb -v 1.37.0 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34ead94..02bd84d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,8 +26,8 @@ jobs: - name: Standard run: | - gem install standardrb - bundle exec standardrb + gem install standardrb -v 1.37.0 + standardrb build: needs: [linting] runs-on: ubuntu-latest From a54ce82a8d2405b9bd4c69cd3e8bfa3a219c8456 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Fri, 16 Aug 2024 14:04:00 +0200 Subject: [PATCH 3/7] CI: Run standardrb on Ruby 3.0 --- .github/workflows/ci.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02bd84d..dec5e69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,17 +17,12 @@ jobs: steps: - uses: actions/checkout@v4 - - - name: Set up Ruby 2.7 + - name: Set up Ruby 3.0 uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: '3.0' bundler-cache: true - - - name: Standard - run: | - gem install standardrb -v 1.37.0 - standardrb + - run: bundle exec standardrb build: needs: [linting] runs-on: ubuntu-latest From 63f209968b540a8517a399ddc97e1b1461a3f0eb Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Fri, 16 Aug 2024 14:06:14 +0200 Subject: [PATCH 4/7] Lint: standardrb --fix --- lib/faraday/adapter/net_http_persistent.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/faraday/adapter/net_http_persistent.rb b/lib/faraday/adapter/net_http_persistent.rb index f3849cf..e3352e2 100644 --- a/lib/faraday/adapter/net_http_persistent.rb +++ b/lib/faraday/adapter/net_http_persistent.rb @@ -31,9 +31,9 @@ class NetHttpPersistent < Faraday::Adapter NET_HTTP_EXCEPTIONS = exceptions.freeze - def initialize(app = nil, opts = {}, &block) + def initialize(app = nil, opts = {}, &) @ssl_cert_store = nil - super(app, opts, &block) + super end def call(env) @@ -194,7 +194,7 @@ def configure_ssl(http, ssl) end def http_set(http, attr, value) - http.send("#{attr}=", value) if http.send(attr) != value + http.send(:"#{attr}=", value) if http.send(attr) != value end def ssl_verify_mode(ssl) From d2114a6e1be6e04beb14411b382512b7611f1a59 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Mon, 19 Aug 2024 12:29:04 +0200 Subject: [PATCH 5/7] CI: keeping using Ruby 2.7 for linting --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dec5e69..5a693f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,10 +17,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Ruby 3.0 + - name: Set up Ruby 2.7 uses: ruby/setup-ruby@v1 with: - ruby-version: '3.0' + ruby-version: '2.7' bundler-cache: true - run: bundle exec standardrb build: From 34bd78b7780e4d0c47b5d6cbffd13aff359784cf Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Mon, 19 Aug 2024 12:30:29 +0200 Subject: [PATCH 6/7] Update net_http_persistent.rb --- lib/faraday/adapter/net_http_persistent.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/faraday/adapter/net_http_persistent.rb b/lib/faraday/adapter/net_http_persistent.rb index e3352e2..f3849cf 100644 --- a/lib/faraday/adapter/net_http_persistent.rb +++ b/lib/faraday/adapter/net_http_persistent.rb @@ -31,9 +31,9 @@ class NetHttpPersistent < Faraday::Adapter NET_HTTP_EXCEPTIONS = exceptions.freeze - def initialize(app = nil, opts = {}, &) + def initialize(app = nil, opts = {}, &block) @ssl_cert_store = nil - super + super(app, opts, &block) end def call(env) @@ -194,7 +194,7 @@ def configure_ssl(http, ssl) end def http_set(http, attr, value) - http.send(:"#{attr}=", value) if http.send(attr) != value + http.send("#{attr}=", value) if http.send(attr) != value end def ssl_verify_mode(ssl) From 4869a97c029ae40c3e2ed24f91973182d69349cf Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Mon, 19 Aug 2024 12:30:53 +0200 Subject: [PATCH 7/7] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a693f1..4558890 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Ruby 2.7 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: 2.7 bundler-cache: true - run: bundle exec standardrb build: