From e8595d137044aa4e103dd3c94fb3194896420962 Mon Sep 17 00:00:00 2001
From: Eric Proulx <playmaverick@gmail.com>
Date: Sat, 15 Nov 2025 18:48:56 +0100
Subject: [PATCH] Add Rails 8.1 to CI test matrix

- Add gemfiles/rails_8_1.gemfile with Rails 8.1 dependency
- Include rails_8_1.gemfile in test workflow matrix
- Add exclusions for incompatible Ruby/Rails combinations:
  - Ruby 3.0 excluded from Rails 8.1 tests
  - Ruby 3.1 excluded from Rails 8.0 tests (duplicate removal)
  - Ruby 3.1 excluded from rails_edge tests in edge workflow
---
 .github/workflows/edge.yml | 2 ++
 .github/workflows/test.yml | 6 +++++-
 CHANGELOG.md               | 1 +
 gemfiles/rails_8_1.gemfile | 6 ++++++
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 gemfiles/rails_8_1.gemfile

diff --git a/.github/workflows/edge.yml b/.github/workflows/edge.yml
index fe3e14393..b5c940278 100644
--- a/.github/workflows/edge.yml
+++ b/.github/workflows/edge.yml
@@ -11,6 +11,8 @@ jobs:
         exclude:
           - ruby: '3.0'
             gemfile: rails_edge
+          - ruby: '3.1'
+            gemfile: rails_edge
     runs-on: ubuntu-latest
     continue-on-error: true
     env:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 451016a4b..d5215ca20 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ['3.0', '3.1', '3.2', '3.3', '3.4']
-        gemfile: [Gemfile, gemfiles/rack_2_0.gemfile, gemfiles/rack_3_0.gemfile, gemfiles/rack_3_1.gemfile, gemfiles/rack_3_2.gemfile, gemfiles/rails_7_0.gemfile, gemfiles/rails_7_1.gemfile, gemfiles/rails_7_2.gemfile, gemfiles/rails_8_0.gemfile]
+        gemfile: [Gemfile, gemfiles/rack_2_0.gemfile, gemfiles/rack_3_0.gemfile, gemfiles/rack_3_1.gemfile, gemfiles/rack_3_2.gemfile, gemfiles/rails_7_0.gemfile, gemfiles/rails_7_1.gemfile, gemfiles/rails_7_2.gemfile, gemfiles/rails_8_0.gemfile, gemfiles/rails_8_1.gemfile]
         specs: ['spec --exclude-pattern=spec/integration/**/*_spec.rb']
         include:
           - ruby: '3.3'
@@ -53,8 +53,12 @@ jobs:
             gemfile: gemfiles/rails_7_2.gemfile
           - ruby: '3.0'
             gemfile: gemfiles/rails_8_0.gemfile
+          - ruby: '3.0'
+            gemfile: gemfiles/rails_8_1.gemfile
           - ruby: '3.1'
             gemfile: gemfiles/rails_8_0.gemfile
+          - ruby: '3.1'
+            gemfile: gemfiles/rails_8_1.gemfile
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdf7b7821..176e11c9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 #### Features
 
 * [#2625](https://github.com/ruby-grape/grape/pull/2625): Update rubocop to 1.81.7 and fix style offenses - [@ericproulx](https://github.com/ericproulx).
+* [#2626](https://github.com/ruby-grape/grape/pull/2626): Add rails 8.1 to CI test matrix - [@ericproulx](https://github.com/ericproulx).
 * Your contribution here.
 
 #### Fixes
diff --git a/gemfiles/rails_8_1.gemfile b/gemfiles/rails_8_1.gemfile
new file mode 100644
index 000000000..dbea0b803
--- /dev/null
+++ b/gemfiles/rails_8_1.gemfile
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+eval_gemfile '../Gemfile'
+
+gem 'rails', '~> 8.1'
+gem 'tzinfo-data', require: false