From 52b373369e86aaa2ca623d9edaede0d294d9bc11 Mon Sep 17 00:00:00 2001 From: Arjun Rajappa Date: Fri, 17 Jan 2025 00:43:16 +0530 Subject: [PATCH 1/2] test: restrict concurrent-ruby to v-1.3.4 temporarily Signed-off-by: Arjun Rajappa --- instana.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instana.gemspec b/instana.gemspec index 73774fe9..49f6936b 100644 --- a/instana.gemspec +++ b/instana.gemspec @@ -41,7 +41,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "fakefs" spec.add_runtime_dependency('base64', '>= 0.1') - spec.add_runtime_dependency('concurrent-ruby', '>= 1.1') + spec.add_runtime_dependency('concurrent-ruby', '1.3.4') spec.add_runtime_dependency('csv', '>= 0.1') spec.add_runtime_dependency('sys-proctable', '>= 1.2.2') spec.add_runtime_dependency('oj', '>=3.0.11') unless RUBY_PLATFORM =~ /java/i From 0f51c706e16baf4d7b3b06f7edc814a0f849c404 Mon Sep 17 00:00:00 2001 From: Arjun Rajappa Date: Fri, 17 Jan 2025 10:41:22 +0530 Subject: [PATCH 2/2] test: restrict gem concurrent-ruby to 1.3.4 only for rails 6 and 7 Signed-off-by: Arjun Rajappa --- gemfiles/rails_61.gemfile | 1 + gemfiles/rails_70.gemfile | 1 + instana.gemspec | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gemfiles/rails_61.gemfile b/gemfiles/rails_61.gemfile index 12cdc2b7..69ff74e0 100644 --- a/gemfiles/rails_61.gemfile +++ b/gemfiles/rails_61.gemfile @@ -16,5 +16,6 @@ gem "rails", ">= 6.1", "< 7.0" gem "mysql2", "0.5.5" gem "pg" gem "sqlite3", "~> 1.4" +gem "concurrent-ruby", "1.3.4" gemspec path: "../" diff --git a/gemfiles/rails_70.gemfile b/gemfiles/rails_70.gemfile index 598010ba..b9a1ca0c 100644 --- a/gemfiles/rails_70.gemfile +++ b/gemfiles/rails_70.gemfile @@ -13,5 +13,6 @@ gem "rails", "7.0.3" gem "mysql2", "0.5.5" gem "pg" gem "sqlite3", "~> 1.4" +gem "concurrent-ruby", "1.3.4" gemspec path: "../" diff --git a/instana.gemspec b/instana.gemspec index 49f6936b..73774fe9 100644 --- a/instana.gemspec +++ b/instana.gemspec @@ -41,7 +41,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "fakefs" spec.add_runtime_dependency('base64', '>= 0.1') - spec.add_runtime_dependency('concurrent-ruby', '1.3.4') + spec.add_runtime_dependency('concurrent-ruby', '>= 1.1') spec.add_runtime_dependency('csv', '>= 0.1') spec.add_runtime_dependency('sys-proctable', '>= 1.2.2') spec.add_runtime_dependency('oj', '>=3.0.11') unless RUBY_PLATFORM =~ /java/i