Merge branch 'main' into mg/fix-json-compatibility

lostisland · Sep 23, 2024 · 7faa285 · 7faa285
2 parents f6d9b74 + 1866410
commit 7faa285
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,27 +14,26 @@ env:
 jobs:
   linting:
     runs-on: ubuntu-latest
-
+    env:
+      BUNDLE_WITHOUT: 'development test'
+      BUNDLE_WITH: 'lint'
     steps:
       - uses: actions/checkout@v4
-
-      - name: Set up Ruby 2.7
+      - name: Set up Ruby 2.6
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 2.6
+          bundler-cache: true # 'bundle install' and cache gems
 
       - name: Rubocop
-        run: |
-          gem install bundler -v 2.4.22
-          bundle config set without 'development test'
-          bundle config set with 'lint'
-          bundle install
-          bundle exec rubocop --format progress
+        run: bundle exec rubocop --format progress
 
+      # Deal with "yard-junk now requires Ruby version >= 2.7.0. The current ruby version is 2.6.10.210."
       - name: Yard-Junk
         run: |
-          gem install yard-junk --no-document
-          yard-junk --path lib
+          gem install ostruct
+          gem install yard-junk -v 0.0.9 --no-document
+          RUBYOPT='-r ostruct' yard-junk --path lib
 
   build:
     needs: [linting]
@@ -44,17 +43,12 @@ jobs:
         ruby: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
 
     steps:
+    - name: Install system dependencies
+      run: sudo apt-get update && sudo apt install libcurl4-openssl-dev
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install libcurl4-openssl-dev
-    - name: Build
-      run: |
-        gem install bundler -v 2.4.22
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true # 'bundle install' and then cache gems
     - name: Test
       run: bundle exec rake
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Faraday Middleware
 ==================
 [![Gem Version](https://badge.fury.io/rb/faraday_middleware.svg)](https://rubygems.org/gems/faraday_middleware)
-![GitHub Actions CI](https://github.com/lostisland/faraday_middleware/workflows/CI/badge.svg)
+[![CI](https://github.com/lostisland/faraday_middleware/actions/workflows/ci.yml/badge.svg)](https://github.com/lostisland/faraday_middleware/actions/workflows/ci.yml)
 
 A collection of useful [Faraday][] middleware. [See the documentation][docs].