From 50ad7a60eb948a29b5e30fa9d404f0c384e7fca3 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Fri, 15 Nov 2024 16:20:26 +0100
Subject: [PATCH 1/4] CI: Run Ruby 2.5 on macos-13

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f9db9b5..4022a6f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,6 +15,11 @@ jobs:
       matrix:
         ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         os: [ ubuntu-latest, macos-latest ]
+        # CRuby < 2.6 does not support macos-arm64, so test those on amd64 instead
+        exclude:
+        - { os: macos-latest, ruby: '2.5' }
+        include:
+        - { os: macos-13, ruby: '2.5' }
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4

From c1c0402670ddde88237973d836d64e9a80cbb0a9 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Fri, 15 Nov 2024 16:44:32 +0100
Subject: [PATCH 2/4] CI: Use a supported bundler for Ruby 2.5

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4022a6f..a5264a3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,5 +28,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
+        # In order to support Ruby 2.5, use a pre-2.4 Bundler.
+        bundler: '2.3.26'
     - name: Run test
       run: bundle exec rake test

From 4d1ee44301806ed547f309751590101d8a3558a6 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Fri, 15 Nov 2024 16:59:03 +0100
Subject: [PATCH 3/4] CI: Clarify errors with fail-fast: false

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a5264a3..aeb6b20 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,6 +12,7 @@ jobs:
     needs: ruby-versions
     name: build (${{ matrix.ruby }} / ${{ matrix.os }})
     strategy:
+      fail-fast: false
       matrix:
         ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         os: [ ubuntu-latest, macos-latest ]

From 51833c4b34122e9bfa0a46f3ec683aeef7bbd9dd Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Fri, 15 Nov 2024 17:03:13 +0100
Subject: [PATCH 4/4] CI: Undo a misunderstanding

---
 .github/workflows/test.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index aeb6b20..9cc075c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,7 +29,5 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
-        # In order to support Ruby 2.5, use a pre-2.4 Bundler.
-        bundler: '2.3.26'
     - name: Run test
       run: bundle exec rake test