From 7fd29f6a2866cbdfea972174c11e025a00ddfe75 Mon Sep 17 00:00:00 2001 From: Tanna McClure Date: Tue, 19 Oct 2021 11:04:36 -0700 Subject: [PATCH 1/5] pin ethon version to 0.14.0 due to failure on jruby in new ethon version --- test/multiverse/suites/typhoeus/Envfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/multiverse/suites/typhoeus/Envfile b/test/multiverse/suites/typhoeus/Envfile index a4463306b9..cd31172e0a 100644 --- a/test/multiverse/suites/typhoeus/Envfile +++ b/test/multiverse/suites/typhoeus/Envfile @@ -7,6 +7,7 @@ instrumentation_methods :chain, :prepend gemfile <<-RB gem 'typhoeus' # latest version + gem 'ethon', '0.14.0' gem 'rack' #{ruby3_gem_webrick} RB @@ -14,6 +15,7 @@ RB SUPPORTED_TYPHOEUS_VERSIONS.each do |version| gemfile <<-RB gem 'typhoeus', '~> #{version}' + gem 'ethon', '0.14.0' gem 'rack' #{ruby3_gem_webrick} RB From 378a510cfc6c77c3d1c70d4a29bf2e523b68bfbf Mon Sep 17 00:00:00 2001 From: Tanna McClure Date: Tue, 19 Oct 2021 12:07:59 -0700 Subject: [PATCH 2/5] only pin ethon version on jruby --- test/multiverse/suites/typhoeus/Envfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/multiverse/suites/typhoeus/Envfile b/test/multiverse/suites/typhoeus/Envfile index cd31172e0a..ecc49d6498 100644 --- a/test/multiverse/suites/typhoeus/Envfile +++ b/test/multiverse/suites/typhoeus/Envfile @@ -7,7 +7,9 @@ instrumentation_methods :chain, :prepend gemfile <<-RB gem 'typhoeus' # latest version - gem 'ethon', '0.14.0' + if RUBY_PLATFORM == 'java' + gem 'ethon', '0.14.0' + end gem 'rack' #{ruby3_gem_webrick} RB @@ -15,7 +17,9 @@ RB SUPPORTED_TYPHOEUS_VERSIONS.each do |version| gemfile <<-RB gem 'typhoeus', '~> #{version}' - gem 'ethon', '0.14.0' + if RUBY_PLATFORM == 'java' + gem 'ethon', '0.14.0' + end gem 'rack' #{ruby3_gem_webrick} RB From c2bb9b772ceff6df8f5cd8e29e45b08f56287972 Mon Sep 17 00:00:00 2001 From: Tanna McClure Date: Tue, 19 Oct 2021 13:27:54 -0700 Subject: [PATCH 3/5] for jruby, pin racc version in rails unit tests ( racc 1.6.0 bugged on jruby) --- test/environments/rails42/Gemfile | 1 + test/environments/rails51/Gemfile | 1 + 2 files changed, 2 insertions(+) diff --git a/test/environments/rails42/Gemfile b/test/environments/rails42/Gemfile index 9b1ad17eee..cee31a29f7 100644 --- a/test/environments/rails42/Gemfile +++ b/test/environments/rails42/Gemfile @@ -13,6 +13,7 @@ platforms :jruby do gem "activerecord-jdbcmysql-adapter", "~>1.3.0" gem "activerecord-jdbcsqlite3-adapter", "~>1.3.0" gem "jruby-openssl" + gem 'racc', '<= 1.5.2' end platforms :ruby, :rbx do diff --git a/test/environments/rails51/Gemfile b/test/environments/rails51/Gemfile index 65c7122eb6..c2ed477786 100644 --- a/test/environments/rails51/Gemfile +++ b/test/environments/rails51/Gemfile @@ -13,6 +13,7 @@ platforms :jruby do gem "activerecord-jdbcmysql-adapter", "~> 51.0" gem "activerecord-jdbcsqlite3-adapter", "~> 51.0" gem "jruby-openssl" + gem 'racc', '<= 1.5.2' end platforms :ruby, :rbx do From 75c6ebfae368dbde3d91ac7c5ed887d9eeaa92de Mon Sep 17 00:00:00 2001 From: Tanna McClure Date: Tue, 19 Oct 2021 14:19:48 -0700 Subject: [PATCH 4/5] add racc pin to rails env files --- test/multiverse/suites/activemerchant/Envfile | 8 ++++++++ test/multiverse/suites/rails/Envfile | 9 +++++++++ test/multiverse/suites/rails_prepend/Envfile | 9 ++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/test/multiverse/suites/activemerchant/Envfile b/test/multiverse/suites/activemerchant/Envfile index c41a732c16..9a4367537e 100644 --- a/test/multiverse/suites/activemerchant/Envfile +++ b/test/multiverse/suites/activemerchant/Envfile @@ -9,6 +9,8 @@ if RUBY_VERSION >= '3.0.0' gem 'nokogiri' gem 'minitest', '~> 5.1.0' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' + # Need to load newrelic_rpm after ActiveMerchant Gateways are required gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../') RB @@ -23,6 +25,8 @@ if RUBY_VERSION >= '2.5.0' && RUBY_VERSION < '3.0.0' gem 'nokogiri' gem 'minitest', '~> 5.1.0' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' + # Need to load newrelic_rpm after ActiveMerchant Gateways are required gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../') RB @@ -37,6 +41,8 @@ if RUBY_VERSION >= '2.3.0' && RUBY_VERSION < '3.0.0' gem 'nokogiri' gem 'minitest', '~> 5.1.0' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' + # Need to load newrelic_rpm after ActiveMerchant Gateways are required gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../') RB @@ -52,6 +58,8 @@ if RUBY_VERSION < '2.4.0' gem 'activesupport', '~>4.0.4' gem 'nokogiri', '~>1.6.1' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' + # Need to load newrelic_rpm after ActiveMerchant Gateways are required gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../') RB diff --git a/test/multiverse/suites/rails/Envfile b/test/multiverse/suites/rails/Envfile index 58c0828488..dc475e4053 100644 --- a/test/multiverse/suites/rails/Envfile +++ b/test/multiverse/suites/rails/Envfile @@ -1,6 +1,7 @@ if RUBY_VERSION >= '2.5.0' gemfile <<-RB gem 'rails', '~> 6.1.0' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' gem 'haml', '~>5.0.0' gem 'haml-rails', '2.0.0' gem 'minitest', '5.2.3' @@ -12,6 +13,7 @@ if RUBY_VERSION >= '2.5.0' && RUBY_VERSION < '3.0.0' gemfile <<-RB gem 'rails', '6.0.0' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' gem 'haml', '~>5.0.0' gem 'haml-rails', '2.0.0' gem 'minitest', '5.2.3' @@ -23,6 +25,7 @@ if RUBY_VERSION >= '2.2.2' && RUBY_VERSION < '3.0.0' gemfile <<-RB gem 'rails', '5.2.2' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' gem 'haml', '~>5.0.0' gem 'haml-rails', '~>1.0.0' gem 'minitest', '5.2.3' @@ -30,6 +33,7 @@ if RUBY_VERSION >= '2.2.2' && RUBY_VERSION < '3.0.0' gemfile <<-RB gem 'rails', '~>5.1.0' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' gem 'haml', '~>5.0.0' gem 'haml-rails', '~>1.0.0' gem 'minitest', '5.2.3' @@ -46,6 +50,7 @@ end if RUBY_VERSION < '2.4.0' gemfile <<-RB gem 'rails', '~>4.2.1' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' gem 'haml', '~>5.0.0' gem 'haml-rails', '~>1.0.0' gem 'minitest', '5.2.3' @@ -54,6 +59,7 @@ if RUBY_VERSION < '2.4.0' gemfile <<-RB gem 'rails', '~>4.1.10' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' # Multiverse has an incompatibility with Minitest 5.3.0, so lock here for # now gem 'haml', '~>5.0.0' @@ -64,6 +70,7 @@ if RUBY_VERSION < '2.4.0' gemfile <<-RB gem 'rails', '~>4.0.13' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' gem 'haml', '~>5.0.0' gem 'haml-rails', '~>1.0.0' gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0 @@ -71,6 +78,7 @@ if RUBY_VERSION < '2.4.0' gemfile <<-RB gem 'rails', '~>3.2.22.2' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' gem 'i18n', '~>0.6.11' gem 'haml', '4.0.2' # Getting load issues with haml 4.0.3 gem 'minitest_tu_shim', :require => false @@ -78,6 +86,7 @@ if RUBY_VERSION < '2.4.0' gemfile <<-RB gem 'rails', '~>3.2.22.2' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' gem 'i18n', '~>0.6.11' gem 'sinatra', '~> 1.4.5' gem 'haml', '4.0.2' # Getting load issues with haml 4.0.3 diff --git a/test/multiverse/suites/rails_prepend/Envfile b/test/multiverse/suites/rails_prepend/Envfile index 9ebc403d33..ee58134d3d 100644 --- a/test/multiverse/suites/rails_prepend/Envfile +++ b/test/multiverse/suites/rails_prepend/Envfile @@ -4,6 +4,7 @@ if RUBY_VERSION >= '2.5.0' && RUBY_VERSION < '3.0.0' gem 'haml', '~>5.0.0' gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__) gem 'minitest', '5.2.3' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' RB end @@ -13,12 +14,14 @@ if RUBY_VERSION >= '2.2.2' && RUBY_VERSION < '3.0.0' gem 'haml', '~>5.0.0' gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__) gem 'minitest', '5.2.3' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' RB gemfile <<-RB gem 'rails', '~>5.1.0' gem 'haml', '~>5.0.0' gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__) + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' gem 'minitest', '5.2.3' RB @@ -26,6 +29,7 @@ if RUBY_VERSION >= '2.2.2' && RUBY_VERSION < '3.0.0' gem 'rails', '~>5.0.0' gem 'haml', '~>5.0.0' gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__) + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' gem 'minitest', '5.2.3' RB end @@ -38,7 +42,8 @@ if RUBY_VERSION < '2.4.0' gem 'minitest', '5.2.3' gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0 gem 'thor', '< 0.20.1' if RUBY_PLATFORM == 'java' # unpredictable thor errors - RB + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' + RB gemfile <<-RB gem 'rails', '~>4.1.10' @@ -49,6 +54,7 @@ if RUBY_VERSION < '2.4.0' gem 'minitest', '5.2.3' gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0 gem 'thor', '< 0.20.1' if RUBY_PLATFORM == 'java' # unpredictable thor errors + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' RB gemfile <<-RB @@ -57,5 +63,6 @@ if RUBY_VERSION < '2.4.0' gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__) gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0 gem 'thor', '< 0.20.1' if RUBY_PLATFORM == 'java' # unpredictable thor errors + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' RB end \ No newline at end of file From 558c819d82e12ad0311dc7158287b140246b474b Mon Sep 17 00:00:00 2001 From: Tanna McClure Date: Tue, 19 Oct 2021 14:45:21 -0700 Subject: [PATCH 5/5] missed a envfile entry --- test/multiverse/suites/rails/Envfile | 1 + 1 file changed, 1 insertion(+) diff --git a/test/multiverse/suites/rails/Envfile b/test/multiverse/suites/rails/Envfile index dc475e4053..731b467c4a 100644 --- a/test/multiverse/suites/rails/Envfile +++ b/test/multiverse/suites/rails/Envfile @@ -41,6 +41,7 @@ if RUBY_VERSION >= '2.2.2' && RUBY_VERSION < '3.0.0' gemfile <<-RB gem 'rails', '~>5.0.0' + gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java' gem 'haml', '~>5.0.0' gem 'haml-rails', '~>1.0.0' gem 'minitest', '5.2.3'