From 156b7ad0117cc8c0bed59133b43352d89e83b5ed Mon Sep 17 00:00:00 2001
From: Peter Solnica <peter@solnica.online>
Date: Thu, 15 May 2025 13:36:48 +0000
Subject: [PATCH 1/2] Revert "[ci] exclude head from the matrix for now
 (#2624)"

This reverts commit 55d4e214c2e98529e502ae44f1fab862680a205a.
---
 .github/workflows/sentry_ruby_test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/sentry_ruby_test.yml b/.github/workflows/sentry_ruby_test.yml
index f0d719dd1..05545ba08 100644
--- a/.github/workflows/sentry_ruby_test.yml
+++ b/.github/workflows/sentry_ruby_test.yml
@@ -53,7 +53,6 @@ jobs:
             rack_version: 3.1
             redis_rb_version: 5.3
         exclude:
-          - ruby_version: 'head' # all rack versions are broken now under head
           - ruby_version: 'jruby'
           - ruby_version: 'jruby-head'
     steps:

From c557e0b19eee174acf12a7e690b2ad6110e2c315 Mon Sep 17 00:00:00 2001
From: Peter Solnica <peter@solnica.online>
Date: Thu, 15 May 2025 13:37:07 +0000
Subject: [PATCH 2/2] Add cgi to bundle for ruby >= 3.5

---
 Gemfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Gemfile b/Gemfile
index 4c3a57a83..4c6001944 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,10 @@ if ruby_version >= Gem::Version.new("2.7.0")
   gem "ruby-lsp-rspec" if ruby_version >= Gem::Version.new("3.0.0") && RUBY_PLATFORM != "java"
 end
 
+if RUBY_VERSION >= "3.5"
+  gem "cgi"
+end
+
 # For RSpec
 gem "rspec", "~> 3.0"
 gem "rspec-retry"