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.

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

Add support for GraphQL 2.0 #1982

Merged
merged 9 commits into from
Apr 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 17 additions & 11 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ elsif ruby_version?('2.2')
gem 'excon'
gem 'faraday'
gem 'grape'
gem 'graphql', '>= 1.12.0', '< 1.13.0' # Newer versions are broken, needs to be investigated, see https://github.com/DataDog/dd-trace-rb/issues/1866
gem 'graphql'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to clarify -- I'm assuming this PR also fixes #1866 ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it does! Thank you for the reminder.

gem 'grpc', '~> 1.19.0' # Last version to support Ruby < 2.3 & google-protobuf < 3.7
gem 'hiredis'
gem 'http'
Expand Down Expand Up @@ -459,7 +459,7 @@ elsif ruby_version?('2.3')
gem 'excon'
gem 'faraday'
gem 'grape'
gem 'graphql', '>= 1.12.0', '< 1.13.0' # Newer versions are broken, needs to be investigated, see https://github.com/DataDog/dd-trace-rb/issues/1866
gem 'graphql'
gem 'grpc'
gem 'google-protobuf', '~> 3.11.0' # Last version to support Ruby < 2.5
gem 'hiredis'
Expand Down Expand Up @@ -577,7 +577,7 @@ elsif ruby_version?('2.4')
gem 'excon'
gem 'faraday'
gem 'grape'
gem 'graphql', '>= 1.12.0', '< 1.13.0' # Newer versions are broken, needs to be investigated, see https://github.com/DataDog/dd-trace-rb/issues/1866
gem 'graphql', '>= 2.0'
gem 'grpc'
gem 'google-protobuf', '~> 3.11.0' # Last version to support Ruby < 2.5
gem 'hiredis'
Expand Down Expand Up @@ -613,6 +613,7 @@ elsif ruby_version?('2.4')

appraise 'contrib-old' do
gem 'faraday', '0.17'
gem 'graphql', '>= 1.12.0', '< 2.0'
end

appraise 'core-old' do
Expand Down Expand Up @@ -821,7 +822,7 @@ elsif ruby_version?('2.5')
gem 'excon'
gem 'faraday'
gem 'grape'
gem 'graphql', '>= 1.12.0', '< 1.13.0' # Newer versions are broken, needs to be investigated, see https://github.com/DataDog/dd-trace-rb/issues/1866
gem 'graphql', '>= 2.0'
gem 'grpc', platform: :ruby
gem 'hiredis'
gem 'http'
Expand Down Expand Up @@ -859,8 +860,9 @@ elsif ruby_version?('2.5')
end

appraise 'contrib-old' do
gem 'faraday', '0.17'
gem 'dalli', '< 3.0.0'
gem 'faraday', '0.17'
gem 'graphql', '>= 1.12.0', '< 2.0'
end

appraise 'core-old' do
Expand Down Expand Up @@ -1044,7 +1046,7 @@ elsif ruby_version?('2.6')
gem 'excon'
gem 'faraday'
gem 'grape'
gem 'graphql', '>= 1.12.0', '< 1.13.0' # Newer versions are broken, needs to be investigated, see https://github.com/DataDog/dd-trace-rb/issues/1866
gem 'graphql', '>= 2.0'
gem 'grpc', platform: :ruby
gem 'hiredis'
gem 'http'
Expand Down Expand Up @@ -1081,8 +1083,9 @@ elsif ruby_version?('2.6')
end

appraise 'contrib-old' do
gem 'faraday', '0.17'
gem 'dalli', '< 3.0.0'
gem 'faraday', '0.17'
gem 'graphql', '>= 1.12.0', '< 2.0'
end

appraise 'core-old' do
Expand Down Expand Up @@ -1248,7 +1251,7 @@ elsif ruby_version?('2.7')
gem 'ethon'
gem 'excon'
gem 'grape'
gem 'graphql', '>= 1.12.0', '< 1.13.0' # Newer versions are broken, needs to be investigated, see https://github.com/DataDog/dd-trace-rb/issues/1866
gem 'graphql', '>= 2.0'
gem 'grpc'
gem 'hiredis'
gem 'http'
Expand Down Expand Up @@ -1282,8 +1285,9 @@ elsif ruby_version?('2.7')
end

appraise 'contrib-old' do
gem 'faraday', '0.17'
gem 'dalli', '< 3.0.0'
gem 'faraday', '0.17'
gem 'graphql', '>= 1.12.0', '< 2.0'
end

appraise 'core-old' do
Expand Down Expand Up @@ -1361,7 +1365,7 @@ elsif ruby_version?('3.0') || ruby_version?('3.1')
gem 'ethon'
gem 'excon'
gem 'grape'
gem 'graphql', '>= 1.12.0', '< 1.13.0' # Newer versions are broken, needs to be investigated, see https://github.com/DataDog/dd-trace-rb/issues/1866
gem 'graphql', '>= 2.0'
gem 'grpc', '>= 1.38.0' # Minimum version with Ruby 3.0 support
gem 'hiredis'
gem 'http'
Expand Down Expand Up @@ -1397,6 +1401,7 @@ elsif ruby_version?('3.0') || ruby_version?('3.1')

appraise 'contrib-old' do
gem 'dalli', '< 3.0.0'
gem 'graphql', '>= 1.12.0', '< 2.0'
end

appraise 'core-old' do
Expand Down Expand Up @@ -1474,7 +1479,7 @@ elsif ruby_version?('3.2')
gem 'ethon'
gem 'excon'
gem 'grape'
gem 'graphql', '>= 1.12.0', '< 1.13.0' # Newer versions are broken, needs to be investigated, see https://github.com/DataDog/dd-trace-rb/issues/1866
gem 'graphql', '>= 2.0'
gem 'grpc', '>= 1.38.0' # Minimum version with Ruby 3.0 support
gem 'hiredis'
gem 'http'
Expand Down Expand Up @@ -1510,6 +1515,7 @@ elsif ruby_version?('3.2')

appraise 'contrib-old' do
gem 'dalli', '< 3.0.0'
gem 'graphql', '>= 1.12.0', '< 2.0'
end
Comment on lines 1516 to 1519
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies for the annoyance -- could you also enable this for 3.2 which I've merged recently in #1974 ?

Note: This also needs a fix on the Rakefile to add 3.2 to the changed line.

Don't bother updating the gemfiles for 3.2 since we still haven't got it enabled in CI; we'll need to do it later anyway.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!


appraise 'core-old' do
Expand Down
1 change: 1 addition & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ task :ci do
# Contrib specs with old gem versions
declare '❌ 2.1 / ❌ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ✅ jruby' => 'bundle exec appraisal contrib-old rake spec:faraday'
declare '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ❌ 2.4 / ❌ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby' => 'bundle exec appraisal contrib-old rake spec:dalli'
declare '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby' => 'bundle exec appraisal contrib-old rake spec:graphql'

# Rails specs
# On Ruby 2.4 and 2.5, we only test Rails 5+ because older versions require Bundler < 2.0
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/jruby_9.2.18.0_contrib.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gemfiles/jruby_9.2.18.0_contrib.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion gemfiles/jruby_9.2.18.0_contrib_old.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions gemfiles/jruby_9.2.18.0_contrib_old.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gemfiles/jruby_9.2.8.0_contrib.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gemfiles/jruby_9.2.8.0_contrib.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion gemfiles/jruby_9.2.8.0_contrib_old.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions gemfiles/jruby_9.2.8.0_contrib_old.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gemfiles/jruby_9.3.4.0_contrib.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gemfiles/jruby_9.3.4.0_contrib.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion gemfiles/jruby_9.3.4.0_contrib_old.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions gemfiles/jruby_9.3.4.0_contrib_old.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gemfiles/ruby_2.2.10_contrib.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gemfiles/ruby_2.2.10_contrib.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gemfiles/ruby_2.3.8_contrib.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gemfiles/ruby_2.3.8_contrib.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gemfiles/ruby_2.4.10_contrib.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gemfiles/ruby_2.4.10_contrib.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions gemfiles/ruby_2.4.10_contrib_old.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions gemfiles/ruby_2.4.10_contrib_old.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gemfiles/ruby_2.5.9_contrib.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading