From 693e10d51e86240f50d9cc0b17b4f9fa0c18e09c Mon Sep 17 00:00:00 2001
From: Fernando Briano <fernando@picandocodigo.net>
Date: Thu, 11 Jan 2024 10:54:06 +0000
Subject: [PATCH] Fix build (#1432)

* Lock version of rubygems-update for Ruby 2.6|7

* Adjust google-protobuff dependency version for Ruby 2.6

* Test longer timeout, one less span for graphql integration
---
 Gemfile                          | 2 +-
 spec/build/update.sh             | 4 ++++
 spec/integration/graphql_spec.rb | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 942d78205..19f70996a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,7 @@ else
 end
 if !defined?(JRUBY_VERSION)
   gem 'google-protobuf', '< 3.12' if RUBY_VERSION < '2.5'
-  gem 'google-protobuf', '< 3.25' if RUBY_VERSION < '2.7' && RUBY_VERSION > '2.5'
+  gem 'google-protobuf', '< 3.23' if RUBY_VERSION < '2.7' && RUBY_VERSION > '2.5'
 end
 gem 'grpc' if !defined?(JRUBY_VERSION) && RUBY_VERSION < '3.0'
 gem 'json'
diff --git a/spec/build/update.sh b/spec/build/update.sh
index 6518daaca..9fb02a233 100755
--- a/spec/build/update.sh
+++ b/spec/build/update.sh
@@ -11,6 +11,10 @@ if [[ "${FRAMEWORK}" =~ ^rails-4\.([0-9]) ]]; then
   gem i "rubygems-update:~>2.7" --no-document
   update_rubygems --no-document
   gem i "bundler:~>1.17.3" --no-document
+elif [[ "${RUBY_VERSION}" =~ ^2\.(6|7).+ ]]; then
+  gem i "rubygems-update:~>3.4.0" --no-document
+  update_rubygems --no-document
+  gem i bundler --no-document
 # Install specific dependencies for 2.4.x and 2.5.x ruby versions
 elif [[ "${RUBY_VERSION}" =~ ^2\.(4|5).+ ]]; then
   gem i "rubygems-update:~>2.7" --no-document
diff --git a/spec/integration/graphql_spec.rb b/spec/integration/graphql_spec.rb
index 219e0d7b0..a521c93f7 100644
--- a/spec/integration/graphql_spec.rb
+++ b/spec/integration/graphql_spec.rb
@@ -181,7 +181,7 @@ def execute
           }
         '
 
-        wait_for transactions: 1, spans: 13
+        wait_for timeout: 10, transactions: 1, spans: 12
 
         expect(resp.status).to be 200