Merge branch 'main' into dependabot/bundler/faraday-gte-2.2-and-lt-2.13

sophiedeziel · Dec 17, 2024 · 5f1988f · 5f1988f
2 parents 6db51c4 + 621c186
commit 5f1988f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Install Ruby and gems
-      uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854
+      uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf
       with:
         ruby-version: 3.2.2
         bundler-cache: true
@@ -31,7 +31,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Install Ruby and gems
-      uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854
+      uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf
       with:
         ruby-version: 3.2.2
         bundler-cache: true

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -39,17 +39,17 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 3.3.0-preview1
+          - 3.4.0-preview1
+          - 3.3
           - 3.2
           - 3.1
-          - 3.0
 
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
 
     - name: Install Ruby and gems
-      uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854
+      uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf
       with:
         ruby-version: ${{ matrix.ruby }}
 

diff --git a/lib/octoprint/client.rb b/lib/octoprint/client.rb
@@ -47,7 +47,6 @@ def use
       yield
     ensure
       Octoprint.client = config_client
-      self
     end
 
     private

diff --git a/octoprint.gemspec b/octoprint.gemspec
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport"
   spec.add_dependency "faraday", ">= 2.2", "< 2.13"
-  spec.add_dependency "faraday-multipart", "~> 1.0.3"
+  spec.add_dependency "faraday-multipart", ">= 1.0.3", "< 1.2.0"
   spec.add_dependency "sorbet-runtime", "~> 0.5.10908"
   spec.add_dependency "zeitwerk", "~> 2.6"
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,6 @@ def use @@
           yield
         ensure
           Octoprint.client = config_client
-          self
         end
         private
@@ Expand Down @@