Skip to content
Open
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
2 changes: 0 additions & 2 deletions instrumentation/active_record/.github-ci.yml

This file was deleted.

31 changes: 23 additions & 8 deletions instrumentation/active_record/Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,36 @@
#
# SPDX-License-Identifier: Apache-2.0

%w[7.1.0 7.2.0 8.0.0].each do |version|
%w[7.1.0 7.2.0].each do |version|
appraise "activerecord-#{version}" do
gem 'sqlite3', '~> 1.4'
gem 'sqlite3', '~> 1.4', platform: :mri
gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
gem 'activerecord', "~> #{version}"
end
end

%w[8.0.0 8.1.0].each do |version|
appraise "activerecord-#{version}" do
if RUBY_ENGINE == 'ruby'
%w[8.0.0 8.1.0].each do |version|
appraise "activerecord-#{version}" do
gem 'sqlite3', '>= 2.1'
gem 'activerecord', "~> #{version}"
end
end

appraise 'activerecord-latest' do
gem 'sqlite3', '>= 2.1'
gem 'activerecord', "~> #{version}"
gem 'activerecord'
end
end

appraise 'activerecord-latest' do
gem 'sqlite3', '>= 2.1'
gem 'activerecord'
if RUBY_ENGINE == 'jruby'
%w[80.0.pre1].each do |version|
appraise "jruby_activerecord-#{version}" do
gem 'activerecord-jdbcsqlite3-adapter', "~> #{version}"
Comment thread
thompson-tomo marked this conversation as resolved.
end
end

appraise 'activerecord-latest' do
gem 'activerecord-jdbcsqlite3-adapter'
end
end
2 changes: 0 additions & 2 deletions instrumentation/active_storage/.github-ci.yml

This file was deleted.

31 changes: 22 additions & 9 deletions instrumentation/active_storage/Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,37 @@
#
# SPDX-License-Identifier: Apache-2.0

%w[7.1.0 7.2.0 8.0.0].each do |version|
%w[7.1.0 7.2.0].each do |version|
appraise "activestorage-#{version}" do
gem 'sqlite3', '~> 1.4'
gem 'sqlite3', '~> 1.4', platform: :mri
gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
gem 'image_processing', '~> 1.2'
gem 'rails', "~> #{version}"
end
end

%w[8.0.0 8.1.0].each do |version|
appraise "activestorage-#{version}" do
if RUBY_ENGINE == 'ruby'
%w[8.0.0 8.1.0].each do |version|
appraise "activestorage-#{version}" do
gem 'sqlite3', '>= 2.1'
gem 'image_processing', '~> 1.2'
gem 'rails', "~> #{version}"
end
end

appraise 'activestorage-latest' do
gem 'sqlite3', '>= 2.1'
gem 'image_processing', '~> 1.2'
gem 'rails', "~> #{version}"
gem 'rails'
end
end

appraise 'activestorage-latest' do
gem 'sqlite3', '>= 2.1'
gem 'image_processing', '~> 1.2'
gem 'rails'
if RUBY_ENGINE == 'jruby'
%w[80.0.pre1].each do |version|
appraise "jruby_activestorage-#{version}" do
gem 'activerecord-jdbcsqlite3-adapter', '80.0.pre1'
gem 'image_processing', '~> 1.2'
gem 'rails', '~> 8.0.0'
end
end
end
1 change: 1 addition & 0 deletions instrumentation/active_storage/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ group :test do
gem 'simplecov', '~> 0.22.0'
gem 'webmock', '~> 3.26.0'
gem 'yard', '~> 0.9.0'
gem 'rbs', '4.1.0.pre.2', platforms: :jruby
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
if RUBY_VERSION >= '3.4'
Expand Down
2 changes: 0 additions & 2 deletions instrumentation/delayed_job/.github-ci.yml

This file was deleted.

3 changes: 2 additions & 1 deletion instrumentation/delayed_job/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ group :test do
gem 'webmock', '~> 3.26.0'
gem 'yard', '~> 0.9.0'
gem 'rspec-mocks', '~> 3.13.7'
gem 'sqlite3', '~> 2.9.0'
gem 'sqlite3', '~> 2.9.0', platform: :mri
gem 'jdbc-sqlite3', platform: :jruby
gem 'opentelemetry-instrumentation-base', path: '../base'
if RUBY_VERSION >= '3.4'
gem 'base64'
Expand Down
2 changes: 0 additions & 2 deletions instrumentation/graphql/.github-ci.yml

This file was deleted.

22 changes: 12 additions & 10 deletions instrumentation/graphql/Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,25 @@

# Max compatible version of 2.0.x

(0..4).each do |minor_version|
(0..6).each do |minor_version|
appraise "graphql-2.#{minor_version}.x" do
gem 'graphql', "~> 2.#{minor_version}.0"
end
end

appraise 'graphql-c_parser-1.0.x' do
gem 'graphql', '< 2.3.1'
gem 'graphql-c_parser', '~> 1.0.0'
end
if RUBY_ENGINE == 'ruby'
appraise 'graphql-c_parser-1.0.x' do
gem 'graphql', '< 2.3.1'
gem 'graphql-c_parser', '~> 1.0.0'
end

appraise 'graphql-c_parser-1.x' do
gem 'graphql-c_parser', '~> 1.1'
end
appraise 'graphql-c_parser-1.x' do
gem 'graphql-c_parser', '~> 1.1'
end

appraise 'graphql-c_parser-latest' do
gem 'graphql-c_parser'
appraise 'graphql-c_parser-latest' do
gem 'graphql-c_parser'
end
end

appraise 'graphql-latest' do
Expand Down
1 change: 1 addition & 0 deletions instrumentation/graphql/test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
require 'simplecov'
require 'bundler/setup'
Bundler.require(:default, :development, :test)
require 'graphql'

require 'minitest/autorun'
require 'webmock/minitest'
Expand Down
Loading