Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build #1432

Merged
merged 3 commits into from
Jan 11, 2024
Merged

Fix build #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f630338
Lock version of rubygems-update for Ruby 2.6|7
picandocodigo Jan 9, 2024
3edf0ee
Adjust google-protobuff dependency version for Ruby 2.6
picandocodigo Jan 9, 2024
c73595e
Test longer timeout, one less span for graphql integration
picandocodigo Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading