From 23bfc39b1ee5b64f1f92fc238d08308cb9a84b37 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Shibuya <mit.shibuya@gmail.com>
Date: Sat, 11 Jan 2025 15:20:37 +0900
Subject: [PATCH] Update build matrix

Marking ruby-head as experimental, until cucumber works on it
---
 .github/workflows/test.yml | 12 ++++++------
 gemfiles/rails-7-1.gemfile |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 55bc1e549..a8816119f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '3.0', '3.1', '3.2', '3.3' ]
+        ruby: [ '2.7', '3.0', '3.1', '3.2', '3.3', '3.4' ]
         gemfile: [ gemfiles/rails-7-1.gemfile ]
         experimental: [ false ]
         include:
@@ -29,16 +29,16 @@ jobs:
             experimental: false
           - ruby: '3.3'
             gemfile: gemfiles/rails-main.gemfile
-            experimental: true
-          - ruby: ruby-head
-            gemfile: gemfiles/rails-7-2.gemfile
             experimental: false
+          - ruby: ruby-head
+            gemfile: gemfiles/rails-8-0.gemfile
+            experimental: true
           - ruby: jruby
             gemfile: gemfiles/rails-7-0.gemfile
-            experimental: true
+            experimental: false
           - ruby: jruby-head
             gemfile: gemfiles/rails-7-0.gemfile
-            experimental: true
+            experimental: false
     runs-on: ubuntu-20.04
     continue-on-error: ${{ matrix.experimental }}
     env:
diff --git a/gemfiles/rails-7-1.gemfile b/gemfiles/rails-7-1.gemfile
index 6ae198f5c..b0b43d332 100644
--- a/gemfiles/rails-7-1.gemfile
+++ b/gemfiles/rails-7-1.gemfile
@@ -4,6 +4,7 @@ gem "rails", "~> 7.1.0"
 gem "activemodel-serializers-xml"
 gem "sqlite3", "~> 1.0", platforms: :ruby
 gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby, :truffleruby]
-gem "observer" # Workaround for https://github.com/rmagick/rmagick/pull/1411
+# Until https://github.com/cucumber/cucumber-ruby/pull/1757 gets released
+gem "cucumber", github: "cucumber/cucumber-ruby" if RUBY_VERSION.to_f >= 3.4
 
 gemspec :path => "../"