Skip to content
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
3 changes: 2 additions & 1 deletion Matrixfile
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@
'activesupport' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
},
'mongodb' => {
'contrib' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
'mongo-latest' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
# 'mongo-min' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
},
'mysql2' => {
'relational_db' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby'
Expand Down
3 changes: 2 additions & 1 deletion appraisal/jruby-9.2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@
build_coverage_matrix('elasticsearch', 7..8)
build_coverage_matrix('faraday', min: '0.14.0')
build_coverage_matrix('excon')
build_coverage_matrix('mongo', min: '2.1.0')

appraise 'relational_db' do
gem 'activerecord', '~> 5'
Expand Down Expand Up @@ -230,7 +231,7 @@
gem 'concurrent-ruby'
gem 'dalli', '>= 3.0.0'
gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596

gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
Expand Down
3 changes: 2 additions & 1 deletion appraisal/jruby-9.3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
build_coverage_matrix('elasticsearch', 7..8)
build_coverage_matrix('faraday', min: '0.14.0')
build_coverage_matrix('excon')
build_coverage_matrix('mongo', min: '2.1.0')

appraise 'relational_db' do
gem 'activerecord', '~> 6.0.0'
Expand Down Expand Up @@ -202,7 +203,7 @@
appraise 'contrib' do
gem 'concurrent-ruby'
gem 'dalli', '>= 3.0.0'
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596

gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'redis', '~> 4'
Expand Down
3 changes: 2 additions & 1 deletion appraisal/jruby-9.4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
build_coverage_matrix('elasticsearch', 7..8)
build_coverage_matrix('faraday')
build_coverage_matrix('excon')
build_coverage_matrix('mongo', min: '2.1.0')

appraise 'relational_db' do
gem 'activerecord', '~> 6.1.0'
Expand Down Expand Up @@ -106,7 +107,7 @@
appraise 'contrib' do
gem 'concurrent-ruby'
gem 'dalli', '>= 3.0.0'
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596

gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
Expand Down
3 changes: 2 additions & 1 deletion appraisal/ruby-2.5.rb
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@
build_coverage_matrix('elasticsearch', 7..8)
build_coverage_matrix('faraday', min: '0.14.0')
build_coverage_matrix('excon')
build_coverage_matrix('mongo', min: '2.1.0')

appraise 'relational_db' do
gem 'activerecord', '~> 5'
Expand Down Expand Up @@ -249,7 +250,7 @@
gem 'concurrent-ruby'
gem 'dalli', '>= 3.0.0'
gem 'grpc', platform: :ruby
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596

gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
Expand Down
3 changes: 2 additions & 1 deletion appraisal/ruby-2.6.rb
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@
build_coverage_matrix('elasticsearch', 7..8)
build_coverage_matrix('faraday', min: '0.14.0')
build_coverage_matrix('excon')
build_coverage_matrix('mongo', min: '2.1.0')

appraise 'relational_db' do
gem 'activerecord', '~> 6.0.0'
Expand Down Expand Up @@ -202,7 +203,7 @@
gem 'concurrent-ruby'
gem 'dalli', '>= 3.0.0'
gem 'grpc', platform: :ruby
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596

gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'redis', '~> 4'
Expand Down
3 changes: 2 additions & 1 deletion appraisal/ruby-2.7.rb
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@
build_coverage_matrix('elasticsearch', 7..8)
build_coverage_matrix('faraday', min: '0.14.0')
build_coverage_matrix('excon')
build_coverage_matrix('mongo', min: '2.1.0')

appraise 'relational_db' do
gem 'activerecord', '~> 6.1.0'
Expand Down Expand Up @@ -202,7 +203,7 @@
gem 'concurrent-ruby'
gem 'dalli', '>= 3.0.0'
gem 'grpc'
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596

gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
Expand Down
3 changes: 2 additions & 1 deletion appraisal/ruby-3.0.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
build_coverage_matrix('elasticsearch', 7..8)
build_coverage_matrix('faraday')
build_coverage_matrix('excon')
build_coverage_matrix('mongo', min: '2.1.0')

appraise 'relational_db' do
gem 'activerecord', '~> 7'
Expand Down Expand Up @@ -124,7 +125,7 @@
gem 'concurrent-ruby'
gem 'dalli', '>= 3.0.0'
gem 'grpc', '>= 1.38.0', platform: :ruby # Minimum version with Ruby 3.0 support
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596

gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
Expand Down
3 changes: 2 additions & 1 deletion appraisal/ruby-3.1.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
build_coverage_matrix('elasticsearch', 7..8)
build_coverage_matrix('faraday')
build_coverage_matrix('excon')
build_coverage_matrix('mongo', min: '2.1.0')

appraise 'relational_db' do
gem 'activerecord', '~> 7'
Expand Down Expand Up @@ -124,7 +125,7 @@
gem 'concurrent-ruby'
gem 'dalli', '>= 3.0.0'
gem 'grpc', '>= 1.38.0', platform: :ruby # Minimum version with Ruby 3.0 support
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596

gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
Expand Down
3 changes: 2 additions & 1 deletion appraisal/ruby-3.2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
build_coverage_matrix('elasticsearch', 7..8)
build_coverage_matrix('faraday')
build_coverage_matrix('excon')
build_coverage_matrix('mongo', min: '2.1.0')

appraise 'relational_db' do
gem 'activerecord', '~> 7'
Expand Down Expand Up @@ -124,7 +125,7 @@
gem 'concurrent-ruby'
gem 'dalli', '>= 3.0.0'
gem 'grpc', '>= 1.38.0', platform: :ruby # Minimum version with Ruby 3.0 support
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596

gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
Expand Down
3 changes: 2 additions & 1 deletion appraisal/ruby-3.3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
build_coverage_matrix('elasticsearch', 7..8)
build_coverage_matrix('faraday')
build_coverage_matrix('excon')
build_coverage_matrix('mongo', min: '2.1.0')

appraise 'relational_db' do
gem 'activerecord', '~> 7'
Expand Down Expand Up @@ -124,7 +125,7 @@
gem 'concurrent-ruby'
gem 'dalli', '>= 3.0.0'
gem 'grpc', '>= 1.38.0', platform: :ruby # Minimum version with Ruby 3.0 support
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596

gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
Expand Down
3 changes: 2 additions & 1 deletion appraisal/ruby-3.4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
build_coverage_matrix('elasticsearch', 7..8)
build_coverage_matrix('faraday')
build_coverage_matrix('excon')
build_coverage_matrix('mongo', min: '2.1.0')

appraise 'relational_db' do
# ActiveRecord locked because tests are failing with 7.1, which was attempted as a part of Ruby 3.4 testing in CI.
Expand Down Expand Up @@ -132,7 +133,7 @@
gem 'dalli', '>= 3.0.0'
# Temporarily disable for Ruby 3.4: No binaries causing build time takes more than 10 minutes
# gem 'grpc', '>= 1.38.0', platform: :ruby
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596

gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
Expand Down
1 change: 0 additions & 1 deletion gemfiles/jruby_9.2_contrib.gemfile

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

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

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

35 changes: 35 additions & 0 deletions gemfiles/jruby_9.2_mongo_latest.gemfile

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

122 changes: 122 additions & 0 deletions gemfiles/jruby_9.2_mongo_latest.gemfile.lock

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

Loading
Loading