From 4c12c00d53213e02c15b900e0ee2e6568918a845 Mon Sep 17 00:00:00 2001
From: Jonathan Rochkind <jonathan@dnil.net>
Date: Tue, 9 Dec 2025 16:04:14 -0500
Subject: [PATCH 1/3] Run CI on BL 7 with Bundler 2.7 -- BL7 generator uses
 Bundler.with_clean_env which Bundler 4 no longer supports

---
 .github/workflows/ruby.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 21498a6..b7733f0 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -131,24 +131,29 @@ jobs:
 
 
           # BLACKLIGHT 7, only test with esbuild, not sure if it supports importmaps, it won't generate it
+          # Blacklight 7 generator uses old `Bundler.with_clean_env`, so needs a bundler < 4. (there is no
+          # bundler 3!)
 
           - rails_version: "7.2.1"
             blacklight_version: "~> 7.0"
             ruby: "3.3"
             additional_engine_cart_rails_options: "--javascript=esbuild"
             additional_name: "/ esbuild, sprockets"
+            bundler: "2.7.2"
 
           - rails_version: "7.2.1"
             blacklight_version: "~> 7.0"
             ruby: "3.3"
             additional_engine_cart_rails_options: "--javascript=esbuild --css=bootstrap  -a propshaft"
             additional_name: "/ esbuild, propshaft"
+            bundler: "2.7.2"
 
           - rails_version: "7.1.4"
             blacklight_version: "~> 7.0"
             ruby: "3.2"
             additional_engine_cart_rails_options: "--javascript=esbuild"
             additional_name: "/ esbuild, sprockets"
+            bundler: "2.7.2"
 
 
     env:
@@ -161,7 +166,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler: "latest"
+          bundler: ${{ matrix.bundler != '' && matrix.bundler || 'latest' }}
 
       - name: Install dependencies
         run: bundle install

From fc61beadfc5c050ecf69da346910084216d04fd2 Mon Sep 17 00:00:00 2001
From: Jonathan Rochkind <jonathan@dnil.net>
Date: Tue, 9 Dec 2025 16:08:40 -0500
Subject: [PATCH 2/3] update CI for Rails 8.1.0 to not specify rc, which makes
 it more readable

---
 .github/workflows/ruby.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index b7733f0..ac2ec41 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -42,13 +42,13 @@ jobs:
           # BLACKLIGHT EDGE, can test with latest rails, importmap and esbuild
           #
 
-          - rails_version: "~> 8.1.0.rc1"
+          - rails_version: "~> 8.1.0"
             blacklight_version: 'https://github.com/projectblacklight/blacklight.git'
             ruby: "3.3"
             additional_name: "/ importmap-rails"
             additional_engine_cart_rails_options: "--css=bootstrap"
 
-          - rails_version: "~> 8.1.0.rc1"
+          - rails_version: "~> 8.1.0"
             blacklight_version: 'https://github.com/projectblacklight/blacklight.git'
             ruby: "3.3"
             additional_name: "/ esbuild"
@@ -57,13 +57,13 @@ jobs:
           # BLACKLIGHT 9 and with Rails 8 and 8.1
           #
 
-          - rails_version: "~> 8.1.0.rc1"
+          - rails_version: "~> 8.1.0"
             blacklight_version: '~> 9.0'
             ruby: "3.4"
             additional_name: "/ importmap-rails"
             additional_engine_cart_rails_options: "--css=bootstrap"
 
-          - rails_version: "~> 8.1.0.rc1"
+          - rails_version: "~> 8.1.0"
             blacklight_version: '~> 9.0'
             ruby: "3.4"
             additional_name: "/ esbuild"
@@ -85,13 +85,13 @@ jobs:
           # BLACKLIGHT 8, can test with use importmaps and esbuild, also rails 8 and 8.1
           # and a bit of 7.2
 
-          - rails_version: "~> 8.1.0.rc1"
+          - rails_version: "~> 8.1.0"
             blacklight_version: "~> 8.0"
             ruby: "3.3"
             additional_name: "/ importmap-rails, propshaft"
             additional_engine_cart_rails_options: "-a propshaft --css=bootstrap"
 
-          - rails_version: "~> 8.1.0.rc1"
+          - rails_version: "~> 8.1.0"
             blacklight_version: "~> 8.0"
             ruby: "3.3"
             additional_engine_cart_rails_options: "-a propshaft --javascript=esbuild --css=bootstrap"

From a37f0ff63f78bd4d0d66b345ac32bc9953b2a1fc Mon Sep 17 00:00:00 2001
From: Jonathan Rochkind <jonathan@dnil.net>
Date: Tue, 16 Dec 2025 11:55:25 -0500
Subject: [PATCH 3/3] lock bundler to <4 in CI for now, engine_cart
 incompatibility

---
 .github/workflows/ruby.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index ac2ec41..6beed6e 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -166,7 +166,10 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler: ${{ matrix.bundler != '' && matrix.bundler || 'latest' }}
+          #bundler: ${{ matrix.bundler != '' && matrix.bundler || 'latest' }}
+          # Bundler locked to <4, see https://github.com/projectblacklight/blacklight_range_limit/pull/328
+          bundler: ${{ matrix.bundler != '' && matrix.bundler || '2.7.2' }}
+
 
       - name: Install dependencies
         run: bundle install