From 21cc665ac681fb1907f4776ceb0fb45d78a77e03 Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Wed, 17 Jan 2024 19:49:18 -0600
Subject: [PATCH] Update tested versions of ruby/rails

We're preventing ruby 7.1 from being tested as Blacklight 7 does not yet work on Rails 7.1
---
 .github/workflows/ruby.yml | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 2fdf336d20..1cab815109 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -23,7 +23,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.7
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
     - name: Run linter
@@ -32,14 +32,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7, '3.0', 3.1, 3.2]
+        ruby: [3.1, 3.2]
+    env:
+      RAILS_VERSION: 7.0.8
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
     - name: Run tests
@@ -51,13 +53,15 @@ jobs:
     strategy:
       matrix:
         ruby: ['3.0']
+    env:
+      RAILS_VERSION: 7.0.8
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
     - name: Run tests
@@ -76,7 +80,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
       env:
@@ -97,7 +101,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
       env:
@@ -107,27 +111,25 @@ jobs:
       env:
         RAILS_VERSION: 5.2.8.1
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-
   test_rails6_1:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         ruby: ['3.0']
+    env:
+      RAILS_VERSION: 6.1.6.1
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
-      env:
-        RAILS_VERSION: 6.1.6.1
     - name: Run tests
       run: bundle exec rake ci
       env:
-        RAILS_VERSION: 6.1.6.1
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-keeps --skip-action-cable --skip-test'
   test_vc3:
     runs-on: ubuntu-latest
@@ -135,6 +137,7 @@ jobs:
       matrix:
         ruby: ['3.2']
     env:
+      RAILS_VERSION: 7.0.8
       VIEW_COMPONENT_VERSION: ${{ matrix.view_component_version }}
     steps:
     - uses: actions/checkout@v2
@@ -142,7 +145,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
     - name: Run tests
@@ -154,12 +157,14 @@ jobs:
     strategy:
       matrix:
         ruby: [2.7, '3.0']
+    env:
+      RAILS_VERSION: 7.0.8
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        bundler: 'latest'
+        bundler: 'default'
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies
       run: bundle install