From fb9e10222ba14990a1e1fc1c87a58cf21f844326 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Sat, 15 Feb 2025 11:12:01 +0100
Subject: [PATCH 1/2] CI: Specify Bundler version

Bundler `latest` has stopped working with older Rubies. We need to
specify the Bundler version for the older Rubies to still build.
---
 .github/workflows/ci.yml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 325b400e..f741c256 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,35 +9,43 @@ jobs:
         include:
           - ruby: 2.5
             gemfile: "gemfiles/Gemfile.rails-6.1-sprockets-3"
+            bundler: "2.3.0"
           - ruby: 2.5
             gemfile: "gemfiles/Gemfile.rails-6.1-sprockets-4"
-
+            bundler: "2.3.0"
           - ruby: 2.7
             gemfile: "gemfiles/Gemfile.rails-7.0-sprockets-3"
+            bundler: "2.4.8"
           - ruby: 2.7
             gemfile: "gemfiles/Gemfile.rails-7.0-sprockets-4"
-
+            bundler: "2.4.8"
           - ruby: 2.7
             gemfile: "gemfiles/Gemfile.rails-7.1-sprockets-3"
+            bundler: "2.4.8"
           - ruby: 2.7
             gemfile: "gemfiles/Gemfile.rails-7.1-sprockets-4"
-
+            bundler: "2.4.8"
           - ruby: 3.1
             gemfile: "gemfiles/Gemfile.rails-7.2-sprockets-3"
+            bundler: default
           - ruby: 3.1
             gemfile: "gemfiles/Gemfile.rails-7.2-sprockets-4"
-
+            bundler: default
           - ruby: 3.2
             gemfile: "gemfiles/Gemfile.rails-8.0-sprockets-3"
+            bundler: default
           - ruby: 3.2
             gemfile: "gemfiles/Gemfile.rails-8.0-sprockets-4"
-
+            bundler: default
           - ruby: 3.2
             gemfile: Gemfile
+            bundler: default
           - ruby: 3.3
             gemfile: Gemfile
+            bundler: default
           - ruby: head
             gemfile: Gemfile
+            bundler: default
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
@@ -49,6 +57,8 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+          cache-version: ${{ matrix.ruby }}-${{ matrix.ruby }}-${{ matrix.gemfile }}
+          bundler: ${{ matrix.bundler }}
       - name: Run tests
         run: bundle exec rake
         continue-on-error: ${{ matrix.gemfile == 'Gemfile' }}

From 647b886fbe683689dab2eaf6e7ce8dff6bb4a925 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Sat, 15 Feb 2025 11:13:38 +0100
Subject: [PATCH 2/2] CI: Fix Rails 7.0 and 6.1

See https://github.com/rails/rails/issues/54260 for context.
---
 gemfiles/Gemfile.rails-6.1-sprockets-3 | 2 ++
 gemfiles/Gemfile.rails-6.1-sprockets-4 | 2 ++
 gemfiles/Gemfile.rails-7.0-sprockets-3 | 2 ++
 gemfiles/Gemfile.rails-7.0-sprockets-4 | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/gemfiles/Gemfile.rails-6.1-sprockets-3 b/gemfiles/Gemfile.rails-6.1-sprockets-3
index 3e31a785..0626d619 100644
--- a/gemfiles/Gemfile.rails-6.1-sprockets-3
+++ b/gemfiles/Gemfile.rails-6.1-sprockets-3
@@ -4,3 +4,5 @@ gemspec path: '..'
 gem 'actionpack', '~> 6.1.0'
 gem 'railties', '~> 6.1.0'
 gem 'sprockets', '~> 3.0'
+
+gem 'concurrent-ruby', '< 1.3.5'
diff --git a/gemfiles/Gemfile.rails-6.1-sprockets-4 b/gemfiles/Gemfile.rails-6.1-sprockets-4
index af14533e..41a6c57a 100644
--- a/gemfiles/Gemfile.rails-6.1-sprockets-4
+++ b/gemfiles/Gemfile.rails-6.1-sprockets-4
@@ -4,3 +4,5 @@ gemspec path: '..'
 gem 'actionpack', '~> 6.1.0'
 gem 'railties', '~> 6.1.0'
 gem 'sprockets', '~> 4.0'
+
+gem 'concurrent-ruby', '< 1.3.5'
diff --git a/gemfiles/Gemfile.rails-7.0-sprockets-3 b/gemfiles/Gemfile.rails-7.0-sprockets-3
index dd25e0ec..c5787efb 100644
--- a/gemfiles/Gemfile.rails-7.0-sprockets-3
+++ b/gemfiles/Gemfile.rails-7.0-sprockets-3
@@ -4,3 +4,5 @@ gemspec path: '..'
 gem 'actionpack', '~> 7.0.0'
 gem 'railties', '~> 7.0.0'
 gem 'sprockets', '~> 3.0'
+
+gem 'concurrent-ruby', '< 1.3.5'
diff --git a/gemfiles/Gemfile.rails-7.0-sprockets-4 b/gemfiles/Gemfile.rails-7.0-sprockets-4
index 27b9dd95..0c73b078 100644
--- a/gemfiles/Gemfile.rails-7.0-sprockets-4
+++ b/gemfiles/Gemfile.rails-7.0-sprockets-4
@@ -4,3 +4,5 @@ gemspec path: '..'
 gem 'actionpack', '~> 7.0.0'
 gem 'railties', '~> 7.0.0'
 gem 'sprockets', '~> 4.0'
+
+gem 'concurrent-ruby', '< 1.3.5'