Skip to content

Commit 693e10d

Browse files
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
1 parent bd51c21 commit 693e10d

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ else
4848
end
4949
if !defined?(JRUBY_VERSION)
5050
gem 'google-protobuf', '< 3.12' if RUBY_VERSION < '2.5'
51-
gem 'google-protobuf', '< 3.25' if RUBY_VERSION < '2.7' && RUBY_VERSION > '2.5'
51+
gem 'google-protobuf', '< 3.23' if RUBY_VERSION < '2.7' && RUBY_VERSION > '2.5'
5252
end
5353
gem 'grpc' if !defined?(JRUBY_VERSION) && RUBY_VERSION < '3.0'
5454
gem 'json'

spec/build/update.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ if [[ "${FRAMEWORK}" =~ ^rails-4\.([0-9]) ]]; then
1111
gem i "rubygems-update:~>2.7" --no-document
1212
update_rubygems --no-document
1313
gem i "bundler:~>1.17.3" --no-document
14+
elif [[ "${RUBY_VERSION}" =~ ^2\.(6|7).+ ]]; then
15+
gem i "rubygems-update:~>3.4.0" --no-document
16+
update_rubygems --no-document
17+
gem i bundler --no-document
1418
# Install specific dependencies for 2.4.x and 2.5.x ruby versions
1519
elif [[ "${RUBY_VERSION}" =~ ^2\.(4|5).+ ]]; then
1620
gem i "rubygems-update:~>2.7" --no-document

spec/integration/graphql_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def execute
181181
}
182182
'
183183

184-
wait_for transactions: 1, spans: 13
184+
wait_for timeout: 10, transactions: 1, spans: 12
185185

186186
expect(resp.status).to be 200
187187

0 commit comments

Comments
 (0)