Use bundler: option on ruby-setup.

mongoid · Jan 5, 2023 · 3786f4d · 3786f4d
1 parent 765311f
commit 3786f4d
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,11 +7,11 @@ jobs:
     strategy:
       matrix:
         entry:
-          - { ruby: "2.6", mongodb: '4.4', gemfile: 'mongoid-4.0', bundler: '2.0.0.pre.3' }
-          - { ruby: "2.7", mongodb: '4.4', gemfile: 'mongoid-5.0', bundler: '2.0.0.pre.3' }
-          - { ruby: "2.7", mongodb: '4.4', gemfile: 'mongoid-6.0' }
-          - { ruby: "2.7", mongodb: '4.4', gemfile: 'mongoid-7.0' }
-          - { ruby: "3.1", mongodb: '4.4', gemfile: 'mongoid-8.0' }
+          - { ruby: '2.6', mongodb: '4.4', gemfile: 'mongoid-4.0', bundler: '1.17.3' }
+          - { ruby: '2.7', mongodb: '4.4', gemfile: 'mongoid-5.0', bundler: '1.17.3' }
+          - { ruby: '2.7', mongodb: '4.4', gemfile: 'mongoid-6.0' }
+          - { ruby: '2.7', mongodb: '4.4', gemfile: 'mongoid-7.0' }
+          - { ruby: '3.1', mongodb: '4.4', gemfile: 'mongoid-8.0' }
     name: test (ruby=${{ matrix.entry.ruby }}, mongodb=${{ matrix.entry.mongodb }}), gemfile=${{ matrix.entry.gemfile }})
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.entry.gemfile }}.gemfile
@@ -25,13 +25,8 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.entry.ruby }}
-      - name: Bundle install w/custom bundler
-        if: ${{ matrix.entry.bundler }}
-        run: |
-          gem install bundler:${{ matrix.entry.bundler }}
-          bundle _${{ matrix.entry.bundler }}_ install
-      - name: Bundle install with default bundler
-        if: ${{ !matrix.entry.bundler }}
+          bundler: '${{ matrix.entry.bundler || 1 }}'
+      - name: Bundle install
         run: bundle install
       - name: Run tests
         run: bundle exec rake