Skip to content

Commit

Permalink
Fix build (#1432)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
picandocodigo authored Jan 11, 2024
1 parent bd51c21 commit 693e10d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 4 additions & 0 deletions spec/build/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/integration/graphql_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 693e10d

Please sign in to comment.