From e37405bb7dcd346de808445c89e743a05d9e2a14 Mon Sep 17 00:00:00 2001 From: Ivo Anjo Date: Tue, 7 Feb 2023 10:39:01 +0000 Subject: [PATCH 1/5] Re-merge Ruby 3.2 appraisals with the rest of the 3.x series This seems to work now, most gems have been updated for 3.2. --- Appraisals | 133 +----------------- gemfiles/ruby_3.2.0_contrib.gemfile | 14 +- gemfiles/ruby_3.2.0_contrib.gemfile.lock | 68 +++++---- gemfiles/ruby_3.2.0_contrib_old.gemfile | 2 +- gemfiles/ruby_3.2.0_contrib_old.gemfile.lock | 4 +- gemfiles/ruby_3.2.0_rails61_mysql2.gemfile | 2 + .../ruby_3.2.0_rails61_mysql2.gemfile.lock | 3 + gemfiles/ruby_3.2.0_rails61_postgres.gemfile | 1 + .../ruby_3.2.0_rails61_postgres.gemfile.lock | 1 + .../ruby_3.2.0_rails61_postgres_redis.gemfile | 3 +- ..._3.2.0_rails61_postgres_redis.gemfile.lock | 9 +- ...uby_3.2.0_rails61_postgres_sidekiq.gemfile | 1 + ....2.0_rails61_postgres_sidekiq.gemfile.lock | 1 + ...ruby_3.2.0_rails61_semantic_logger.gemfile | 1 + ...3.2.0_rails61_semantic_logger.gemfile.lock | 1 + 15 files changed, 69 insertions(+), 175 deletions(-) diff --git a/Appraisals b/Appraisals index 0f33b0de475..ea41e4442c8 100644 --- a/Appraisals +++ b/Appraisals @@ -1480,7 +1480,7 @@ elsif ruby_version?('2.7') gem 'dogstatsd-ruby', '~> 4' end # ---------------------------------------------------------------------------------------------------------------------- -elsif ruby_version?('3.0') || ruby_version?('3.1') +elsif ruby_version?('3.0') || ruby_version?('3.1') || ruby_version?('3.2') appraise 'rails61-mysql2' do gem 'rails', '~> 6.1.0' gem 'mysql2', '~> 0.5', platform: :ruby @@ -1624,137 +1624,8 @@ elsif ruby_version?('3.0') || ruby_version?('3.1') gem 'dogstatsd-ruby', '~> 4' end # ---------------------------------------------------------------------------------------------------------------------- -elsif ruby_version?('3.2') - appraise 'rails61-mysql2' do - gem 'rails', '~> 6.1.0' - # gem 'mysql2', '~> 0.5', platform: :ruby # broken on Ruby 3.2.0-preview1 - gem 'sprockets', '< 4' - gem 'lograge', '~> 0.11' - gem 'net-smtp' - end - - appraise 'rails61-postgres' do - gem 'rails', '~> 6.1.0' - gem 'pg', '>= 1.1', platform: :ruby - gem 'sprockets', '< 4' - gem 'lograge', '~> 0.11' - gem 'net-smtp' - end - - appraise 'rails61-postgres-redis' do - gem 'rails', '~> 6.1.0' - gem 'pg', '>= 1.1', platform: :ruby - gem 'redis', '>= 4.2.5' - gem 'sprockets', '< 4' - gem 'lograge', '~> 0.11' - gem 'net-smtp' - end - - appraise 'rails61-postgres-sidekiq' do - gem 'rails', '~> 6.1.0' - gem 'pg', '>= 1.1', platform: :ruby - gem 'sidekiq', '>= 6.1.2' - gem 'sprockets', '< 4' - gem 'lograge', '~> 0.11' - gem 'rails_semantic_logger', '~> 4.0' - gem 'net-smtp' - end - - appraise 'rails61-semantic-logger' do - gem 'rails', '~> 6.1.0' - gem 'pg', '>= 1.1', platform: :ruby - gem 'sprockets', '< 4' - gem 'rails_semantic_logger', '~> 4.0' - gem 'net-smtp' - end - - appraise 'resque2-redis3' do - gem 'redis', '< 4.0' - gem 'resque', '>= 2.0' - end - - appraise 'resque2-redis4' do - gem 'redis', '>= 4.0' - gem 'resque', '>= 2.0' - end - - (3..5).each { |v| gem_cucumber(v) } - - appraise 'contrib' do - gem 'actionpack', '~> 7' - gem 'actionview', '~> 7' - gem 'active_model_serializers', '>= 0.10.0' - gem 'activerecord', '~> 7' - gem 'aws-sdk' - gem 'concurrent-ruby' - gem 'cucumber' - gem 'dalli', '>= 3.0.0' - gem 'delayed_job' - gem 'delayed_job_active_record' - gem 'elasticsearch', '>= 8.0.0' - gem 'ethon' - gem 'excon' - gem 'grape' - gem 'graphql', '>= 2.0' - gem 'grpc', '>= 1.38.0' # Minimum version with Ruby 3.0 support - gem 'http' - gem 'httpclient' - gem 'lograge' - gem 'makara', '>= 0.6.0.pre' # Ruby 3 requires >= 0.6.0, which is currently in pre-release: https://rubygems.org/gems/makara/versions - 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 'mysql2', '>= 0.5.3', platform: :ruby # broken on Ruby 3.2.0-preview1 - gem 'pg', '>= 1.1', platform: :ruby - gem 'racecar', '>= 0.3.5' - gem 'rack' - gem 'rack-contrib' - gem 'rack-test' - gem 'rake', '>= 12.3' - gem 'rest-client' - gem 'resque' - gem 'roda', '>= 2.0.0' - gem 'ruby-kafka', '>= 0.7.10' - gem 'rspec', '>= 3.0.0' - gem 'semantic_logger', '~> 4.0' - gem 'sequel', '~> 5.54.0' # TODO: Support sequel 5.62.0+ - gem 'shoryuken' - gem 'sidekiq' - gem 'sneakers', '>= 2.12.0' - gem 'sqlite3', '>= 1.4.2' - gem 'stripe' - gem 'sucker_punch' - gem 'typhoeus' - gem 'que', '>= 1.0.0' - gem 'net-smtp' - end - - appraise 'sinatra' do - gem 'sinatra', '>= 3' - gem 'rack-test' - end - - appraise 'opentelemetry' do - gem 'opentelemetry-sdk', '~> 1.1' - end - - [3, 4, 5].each do |n| - appraise "redis-#{n}" do - gem 'redis', "~> #{n}" - end - end - - appraise 'contrib-old' do - gem 'dalli', '< 3.0.0' - gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0 - gem 'graphql', '>= 1.12.0', '< 2.0' - gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0 - gem 'qless', '0.12.0' - end - - appraise 'core-old' do - gem 'dogstatsd-ruby', '~> 4' - end -end # ADD NEW RUBIES HERE +end ruby_runtime = if defined?(RUBY_ENGINE_VERSION) "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}" diff --git a/gemfiles/ruby_3.2.0_contrib.gemfile b/gemfiles/ruby_3.2.0_contrib.gemfile index d3bb22cfbdc..08b4c284577 100644 --- a/gemfiles/ruby_3.2.0_contrib.gemfile +++ b/gemfiles/ruby_3.2.0_contrib.gemfile @@ -42,7 +42,7 @@ gem "actionview", "~> 7" gem "active_model_serializers", ">= 0.10.0" gem "activerecord", "~> 7" gem "aws-sdk" -gem "cucumber" +gem "cucumber", "~> 7" gem "dalli", ">= 3.0.0" gem "delayed_job" gem "delayed_job_active_record" @@ -51,13 +51,16 @@ gem "ethon" gem "excon" gem "grape" gem "graphql", ">= 2.0" -gem "grpc", ">= 1.38.0" +gem "grpc", ">= 1.38.0", platform: :ruby gem "http" gem "httpclient" gem "lograge" gem "makara", ">= 0.6.0.pre" gem "mongo", ">= 2.8.0", "< 2.15.0" -gem "pg", ">= 1.1", platform: :ruby +gem "mysql2", ">= 0.5.3", platform: :ruby +gem "activerecord-jdbcmysql-adapter", platform: :jruby +gem "pg", platform: :ruby +gem "activerecord-jdbcpostgresql-adapter", platform: :jruby gem "racecar", ">= 0.3.5" gem "rack" gem "rack-contrib" @@ -69,10 +72,11 @@ gem "ruby-kafka", ">= 0.7.10" gem "semantic_logger", "~> 4.0" gem "sequel", "~> 5.54.0" gem "shoryuken" -gem "sidekiq" +gem "sidekiq", "~> 6" gem "sneakers", ">= 2.12.0" -gem "sqlite3", ">= 1.4.2" +gem "sqlite3", ">= 1.4.2", platform: :ruby gem "stripe" +gem "jdbc-sqlite3", ">= 3.28", platform: :jruby gem "sucker_punch" gem "typhoeus" gem "que", ">= 1.0.0" diff --git a/gemfiles/ruby_3.2.0_contrib.gemfile.lock b/gemfiles/ruby_3.2.0_contrib.gemfile.lock index fec11955971..54a305699a4 100644 --- a/gemfiles/ruby_3.2.0_contrib.gemfile.lock +++ b/gemfiles/ruby_3.2.0_contrib.gemfile.lock @@ -1437,30 +1437,36 @@ GEM rexml crass (1.0.6) cri (2.15.11) - cucumber (8.0.0) + cucumber (7.1.0) builder (~> 3.2, >= 3.2.4) - cucumber-ci-environment (~> 9.0, >= 9.0.4) - cucumber-core (~> 11.0, >= 11.0.0) - cucumber-cucumber-expressions (~> 15.1, >= 15.1.1) - cucumber-gherkin (~> 23.0, >= 23.0.1) - cucumber-html-formatter (~> 19.1, >= 19.1.0) - cucumber-messages (~> 18.0, >= 18.0.0) - diff-lcs (~> 1.5, >= 1.5.0) - mime-types (~> 3.4, >= 3.4.1) - multi_test (~> 1.1, >= 1.1.0) + cucumber-core (~> 10.1, >= 10.1.0) + cucumber-create-meta (~> 6.0, >= 6.0.1) + cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) + cucumber-gherkin (~> 22.0, >= 22.0.0) + cucumber-html-formatter (~> 17.0, >= 17.0.0) + cucumber-messages (~> 17.1, >= 17.1.1) + cucumber-wire (~> 6.2, >= 6.2.0) + diff-lcs (~> 1.4, >= 1.4.4) + mime-types (~> 3.3, >= 3.3.1) + multi_test (~> 0.1, >= 0.1.2) sys-uname (~> 1.2, >= 1.2.2) - cucumber-ci-environment (9.1.0) - cucumber-core (11.0.0) - cucumber-gherkin (~> 23.0, >= 23.0.1) - cucumber-messages (~> 18.0, >= 18.0.0) + cucumber-core (10.1.1) + cucumber-gherkin (~> 22.0, >= 22.0.0) + cucumber-messages (~> 17.1, >= 17.1.1) cucumber-tag-expressions (~> 4.1, >= 4.1.0) - cucumber-cucumber-expressions (15.2.0) - cucumber-gherkin (23.0.1) - cucumber-messages (~> 18.0, >= 18.0.0) - cucumber-html-formatter (19.2.0) - cucumber-messages (~> 18.0, >= 18.0.0) - cucumber-messages (18.0.0) + cucumber-create-meta (6.0.4) + cucumber-messages (~> 17.1, >= 17.1.1) + sys-uname (~> 1.2, >= 1.2.2) + cucumber-cucumber-expressions (14.0.0) + cucumber-gherkin (22.0.0) + cucumber-messages (~> 17.1, >= 17.1.1) + cucumber-html-formatter (17.0.0) + cucumber-messages (~> 17.1, >= 17.1.0) + cucumber-messages (17.1.1) cucumber-tag-expressions (4.1.0) + cucumber-wire (6.2.1) + cucumber-core (~> 10.1, >= 10.1.0) + cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) dalli (3.2.3) debase-ruby_core_source (3.2.0) debug_inspector (1.1.0) @@ -1574,11 +1580,12 @@ GEM mono_logger (1.1.1) msgpack (1.6.0) multi_json (1.15.0) - multi_test (1.1.0) + multi_test (0.1.2) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) mustermann-grape (1.0.2) mustermann (>= 1.0.0) + mysql2 (0.5.5) net-protocol (0.2.1) timeout net-smtp (0.3.3) @@ -1713,11 +1720,10 @@ GEM aws-sdk-core (>= 2) concurrent-ruby thor - sidekiq (7.0.3) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.11.0) + sidekiq (6.5.5) + connection_pool (>= 2.2.2) + rack (~> 2.0) + redis (>= 4.5.0) sigdump (0.2.4) simplecov-cobertura (2.1.0) rexml @@ -1775,6 +1781,8 @@ DEPENDENCIES actionview (~> 7) active_model_serializers (>= 0.10.0) activerecord (~> 7) + activerecord-jdbcmysql-adapter + activerecord-jdbcpostgresql-adapter addressable (~> 2.4.0) appraisal (~> 2.4.0) aws-sdk @@ -1783,7 +1791,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - cucumber + cucumber (~> 7) dalli (>= 3.0.0) ddtrace! delayed_job @@ -1799,15 +1807,17 @@ DEPENDENCIES grpc (>= 1.38.0) http httpclient + jdbc-sqlite3 (>= 3.28) json-schema (< 3) lograge makara (>= 0.6.0.pre) memory_profiler (~> 0.9) mongo (>= 2.8.0, < 2.15.0) + mysql2 (>= 0.5.3) net-smtp opentracing (>= 0.4.1) os (~> 1.1) - pg (>= 1.1) + pg pimpmychangelog (>= 0.1.2) pry pry-stack_explorer @@ -1835,7 +1845,7 @@ DEPENDENCIES semantic_logger (~> 4.0) sequel (~> 5.54.0) shoryuken - sidekiq + sidekiq (~> 6) simplecov! simplecov-cobertura (~> 2.1.0) sneakers (>= 2.12.0) diff --git a/gemfiles/ruby_3.2.0_contrib_old.gemfile b/gemfiles/ruby_3.2.0_contrib_old.gemfile index b0fda1b0799..bcf7a6b91de 100644 --- a/gemfiles/ruby_3.2.0_contrib_old.gemfile +++ b/gemfiles/ruby_3.2.0_contrib_old.gemfile @@ -39,7 +39,7 @@ gem "opentracing", ">= 0.4.1" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] gem "dalli", "< 3.0.0" gem "elasticsearch", "< 8.0.0" -gem "graphql", ">= 1.12.0", "< 2.0" +gem "graphql", "~> 1.12.0", "< 2.0" gem "presto-client", ">= 0.5.14" gem "qless", "0.12.0" diff --git a/gemfiles/ruby_3.2.0_contrib_old.gemfile.lock b/gemfiles/ruby_3.2.0_contrib_old.gemfile.lock index 2697000ad77..54c34acd880 100644 --- a/gemfiles/ruby_3.2.0_contrib_old.gemfile.lock +++ b/gemfiles/ruby_3.2.0_contrib_old.gemfile.lock @@ -65,7 +65,7 @@ GEM faraday (>= 0.7.4, < 1.0) ffi (1.15.5) google-protobuf (3.21.12) - graphql (1.13.18) + graphql (1.12.24) hashdiff (1.0.1) hitimes (1.3.1) json (2.6.3) @@ -217,7 +217,7 @@ DEPENDENCIES elasticsearch (< 8.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) - graphql (>= 1.12.0, < 2.0) + graphql (~> 1.12.0, < 2.0) json-schema (< 3) memory_profiler (~> 0.9) opentracing (>= 0.4.1) diff --git a/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile b/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile index 3932246ded4..7b759abd3f0 100644 --- a/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile +++ b/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile @@ -38,6 +38,8 @@ gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "opentracing", ">= 0.4.1" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] gem "rails", "~> 6.1.0" +gem "mysql2", "~> 0.5", platform: :ruby +gem "activerecord-jdbcmysql-adapter", platform: :jruby gem "sprockets", "< 4" gem "lograge", "~> 0.11" gem "net-smtp" diff --git a/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile.lock index 95e06be023d..1543f130937 100644 --- a/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile.lock @@ -142,6 +142,7 @@ GEM mini_mime (1.1.2) minitest (5.17.0) msgpack (1.6.0) + mysql2 (0.5.5) net-imap (0.3.4) date net-protocol @@ -283,6 +284,7 @@ PLATFORMS x86_64-linux DEPENDENCIES + activerecord-jdbcmysql-adapter addressable (~> 2.4.0) appraisal (~> 2.4.0) benchmark-ips (~> 2.8) @@ -297,6 +299,7 @@ DEPENDENCIES json-schema (< 3) lograge (~> 0.11) memory_profiler (~> 0.9) + mysql2 (~> 0.5) net-smtp opentracing (>= 0.4.1) os (~> 1.1) diff --git a/gemfiles/ruby_3.2.0_rails61_postgres.gemfile b/gemfiles/ruby_3.2.0_rails61_postgres.gemfile index 88753bb7373..5e2352dd056 100644 --- a/gemfiles/ruby_3.2.0_rails61_postgres.gemfile +++ b/gemfiles/ruby_3.2.0_rails61_postgres.gemfile @@ -39,6 +39,7 @@ gem "opentracing", ">= 0.4.1" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] gem "rails", "~> 6.1.0" gem "pg", ">= 1.1", platform: :ruby +gem "activerecord-jdbcpostgresql-adapter", platform: :jruby gem "sprockets", "< 4" gem "lograge", "~> 0.11" gem "net-smtp" diff --git a/gemfiles/ruby_3.2.0_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_postgres.gemfile.lock index f7ea52bba3b..2da94a13be6 100644 --- a/gemfiles/ruby_3.2.0_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_3.2.0_rails61_postgres.gemfile.lock @@ -284,6 +284,7 @@ PLATFORMS x86_64-linux DEPENDENCIES + activerecord-jdbcpostgresql-adapter addressable (~> 2.4.0) appraisal (~> 2.4.0) benchmark-ips (~> 2.8) diff --git a/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile b/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile index 732a3b838fc..f10f0adf665 100644 --- a/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile +++ b/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile @@ -39,7 +39,8 @@ gem "opentracing", ">= 0.4.1" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] gem "rails", "~> 6.1.0" gem "pg", ">= 1.1", platform: :ruby -gem "redis", ">= 4.2.5" +gem "activerecord-jdbcpostgresql-adapter", platform: :jruby +gem "redis", "~> 4" gem "sprockets", "< 4" gem "lograge", "~> 0.11" gem "net-smtp" diff --git a/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile.lock index e85eb6d33a8..e3c3dced34e 100644 --- a/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile.lock @@ -95,7 +95,6 @@ GEM coderay (1.1.3) colorize (0.8.1) concurrent-ruby (1.2.0) - connection_pool (2.3.0) crack (0.4.5) rexml crass (1.0.6) @@ -205,10 +204,7 @@ GEM rake-compiler (1.2.1) rake redcarpet (3.6.0) - redis (5.0.6) - redis-client (>= 0.9.0) - redis-client (0.12.1) - connection_pool + redis (4.8.0) regexp_parser (2.6.2) request_store (1.5.1) rack (>= 1.4) @@ -289,6 +285,7 @@ PLATFORMS x86_64-linux DEPENDENCIES + activerecord-jdbcpostgresql-adapter addressable (~> 2.4.0) appraisal (~> 2.4.0) benchmark-ips (~> 2.8) @@ -314,7 +311,7 @@ DEPENDENCIES rake (>= 10.5) rake-compiler (~> 1.1, >= 1.1.1) redcarpet (~> 3.4) - redis (>= 4.2.5) + redis (~> 4) rspec (~> 3.12) rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) diff --git a/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile b/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile index 45c6896dde1..c733d161719 100644 --- a/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile +++ b/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile @@ -39,6 +39,7 @@ gem "opentracing", ">= 0.4.1" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] gem "rails", "~> 6.1.0" gem "pg", ">= 1.1", platform: :ruby +gem "activerecord-jdbcpostgresql-adapter", platform: :jruby gem "sidekiq", ">= 6.1.2" gem "sprockets", "< 4" gem "lograge", "~> 0.11" diff --git a/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile.lock index b15274678c4..6768bf191b1 100644 --- a/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile.lock @@ -298,6 +298,7 @@ PLATFORMS x86_64-linux DEPENDENCIES + activerecord-jdbcpostgresql-adapter addressable (~> 2.4.0) appraisal (~> 2.4.0) benchmark-ips (~> 2.8) diff --git a/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile b/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile index d55f9423821..56d53f2de18 100644 --- a/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile +++ b/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile @@ -39,6 +39,7 @@ gem "opentracing", ">= 0.4.1" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] gem "rails", "~> 6.1.0" gem "pg", ">= 1.1", platform: :ruby +gem "activerecord-jdbcpostgresql-adapter", platform: :jruby gem "sprockets", "< 4" gem "rails_semantic_logger", "~> 4.0" gem "net-smtp" diff --git a/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile.lock index 6d4a12c6ed9..292e69e138d 100644 --- a/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile.lock @@ -283,6 +283,7 @@ PLATFORMS x86_64-linux DEPENDENCIES + activerecord-jdbcpostgresql-adapter addressable (~> 2.4.0) appraisal (~> 2.4.0) benchmark-ips (~> 2.8) From c4d343614494c6883bea58795c212f9cc642ac35 Mon Sep 17 00:00:00 2001 From: Ivo Anjo Date: Tue, 7 Feb 2023 10:42:59 +0000 Subject: [PATCH 2/5] Add missing dependency on presto for Ruby 3.1/3.2 images Otherwise the presto specs always fail. --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index e6bb1fae723..9ff20920008 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -225,6 +225,7 @@ services: - mongodb - mysql - postgres + - presto - redis - redis_old env_file: ./.env @@ -248,6 +249,7 @@ services: - mongodb - mysql - postgres + - presto - redis - redis_old env_file: ./.env From 54c0e007923da9a8d1ebf601a69ea89306e0ad62 Mon Sep 17 00:00:00 2001 From: Ivo Anjo Date: Tue, 7 Feb 2023 10:44:40 +0000 Subject: [PATCH 3/5] Try to re-enable a few more Ruby 3.2 test cases, these should be OK now --- Rakefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index eff2da8186c..6aa66a4f2f4 100644 --- a/Rakefile +++ b/Rakefile @@ -370,9 +370,9 @@ task :ci do 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 rails6-postgres-redis-activesupport rake spec:railsredis_activesupport' 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 rails6-postgres-sidekiq rake spec:railsactivejob' 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 rails6-semantic-logger rake spec:railssemanticlogger' - 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 rails61-mysql2 rake spec:action_cable' - 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 rails61-mysql2 rake spec:action_mailer' - 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 rails61-mysql2 rake spec:rails' + 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 rails61-mysql2 rake spec:action_cable' + 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 rails61-mysql2 rake spec:action_mailer' + 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 rails61-mysql2 rake spec:rails' 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 rails61-postgres rake spec:rails' 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 rails61-postgres rake spec:railsdisableenv' 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 rails61-postgres-redis rake spec:railsredis' @@ -408,7 +408,7 @@ task :ci do 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 rails4-mysql2 rake spec:appsec:rails' 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 rails5-mysql2 rake spec:appsec:rails' 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 rails6-mysql2 rake spec:appsec:rails' - 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 rails61-mysql2 rake spec:appsec:rails' + 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 rails61-mysql2 rake spec:appsec:rails' # Upstream gem test suite with ddtrace enabled declare '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ❌ 2.4 / ❌ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ❌ jruby' => 'bundle exec rake upstream:opentelemetry' From 2e8e4d91d0f5aad19bffc98f4ea3fe9751c434c1 Mon Sep 17 00:00:00 2001 From: Ivo Anjo Date: Tue, 7 Feb 2023 10:48:08 +0000 Subject: [PATCH 4/5] Enable Ruby 3.2 testing in CI Let's get this show on the road! --- .circleci/config.yml | 31 +++++++++++++------------------ .github/workflows/test-macos.yaml | 1 + 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a5f4e35a9f4..efa1999ac47 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -582,8 +582,7 @@ workflows: - test-2.7 - test-3.0 - test-3.1 - # TODO: Re-enable once 3.2 testing is green! - #- test-3.2 + - test-3.2 # ADD NEW RUBIES HERE # TODO: Disabled for possible removal #- test-jruby-9.2.8.0 @@ -731,12 +730,11 @@ workflows: - orb/build: <<: *config-3_2 name: build-3.2 - # TODO: Re-enable once 3.2 testing is green! - # - orb/test: - # <<: *config-3_2 - # name: test-3.2 - # requires: - # - build-3.2 + - orb/test: + <<: *config-3_2 + name: test-3.2 + requires: + - build-3.2 # ADD NEW RUBIES HERE # TODO: Disabled for possible removal # - orb/build: @@ -778,8 +776,7 @@ workflows: - test-2.7 - test-3.0 - test-3.1 - # TODO: Re-enable once 3.2 testing is green! - #- test-3.2 + - test-3.2 # ADD NEW RUBIES HERE # TODO: Disabled for possible removal # - test-jruby-9.2.8.0 @@ -799,8 +796,7 @@ workflows: - test-2.7 - test-3.0 - test-3.1 - # TODO: Re-enable once 3.2 testing is green! - #- test-3.2 + - test-3.2 # ADD NEW RUBIES HERE # TODO: Disabled for possible removal # - test-jruby-9.2.8.0 @@ -960,12 +956,11 @@ workflows: <<: *config-3_2 name: build-3.2 edge: true - # TODO: Re-enable once 3.2 testing is green! - # - orb/test: - # <<: *config-3_2 - # name: test-3.2 - # requires: - # - build-3.2 + - orb/test: + <<: *config-3_2 + name: test-3.2 + requires: + - build-3.2 # ADD NEW RUBIES HERE # TODO: Disabled for possible removal # - orb/build: diff --git a/.github/workflows/test-macos.yaml b/.github/workflows/test-macos.yaml index 42c81e5a1ae..024a997d3c2 100644 --- a/.github/workflows/test-macos.yaml +++ b/.github/workflows/test-macos.yaml @@ -18,6 +18,7 @@ jobs: - '2.7' - '3.0' - '3.1' + - '3.2' # ADD NEW RUBIES HERE name: Test (${{ matrix.os }}, ${{ matrix.ruby }}) runs-on: ${{ matrix.os }} From b8a028e81888e2dec350a19cdddaf8ff3d15ae57 Mon Sep 17 00:00:00 2001 From: Ivo Anjo Date: Tue, 7 Feb 2023 10:59:14 +0000 Subject: [PATCH 5/5] Disable sidekiq specs on Ruby 3.2 as they are failing --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 6aa66a4f2f4..c23d3e09a88 100644 --- a/Rakefile +++ b/Rakefile @@ -318,7 +318,7 @@ task :ci do 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 rake spec:semantic_logger' 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 rake spec:sequel' 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 rake spec:shoryuken' - 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 rake spec:sidekiq' + 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 rake spec:sidekiq' # Disabled on 3.2 pending investigation of failing spec 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 rake spec:sneakers' 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 rake spec:stripe' 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 rake spec:sucker_punch'