Merge pull request #3752 from DataDog/tonycthsu/jruby-9.4

Add JRuby 9.4 to test matrix

.circleci/config.yml

@@ -494,6 +494,11 @@ job_configuration:
     ruby_version: 'jruby-9.3.9.0'
     image: ghcr.io/datadog/dd-trace-rb/jruby:9.3.9.0-dd
     resource_class_to_use: large
+  - &config-jruby-9_4
+    <<: *filters_all_branches_and_tags
+    ruby_version: 'jruby-9.4.7.0'
+    image: ghcr.io/datadog/dd-trace-rb/jruby:9.4.7.0-dd
+    resource_class_to_use: large
 
 workflows:
   version: 2
@@ -518,6 +523,7 @@ workflows:
             # ADD NEW RUBIES HERE
             - test-jruby-9.2
             - test-jruby-9.3
+            - test-jruby-9.4
       - orb/changelog:
           <<: *config-2_7-small
           name: changelog
@@ -638,6 +644,14 @@ workflows:
           name: test-jruby-9.3
           requires:
             - build-jruby-9.3
+      - orb/build:
+          <<: *config-jruby-9_4
+          name: build-jruby-9.4
+      - orb/test:
+          <<: *config-jruby-9_4
+          name: test-jruby-9.4
+          requires:
+            - build-jruby-9.4
   # This workflow runs the same `build` and `test` jobs as above on a schedule.
   # Tasks related to housekeeping (e.g. prerelease) are not relevant
   # to this daily check, as they are not expected to be impacted here.
@@ -769,3 +783,11 @@ workflows:
           name: test-jruby-9.3
           requires:
             - build-jruby-9.3
+      - orb/build:
+          <<: *config-jruby-9_4
+          name: build-jruby-9.4
+      - orb/test:
+          <<: *config-jruby-9_4
+          name: test-jruby-9.4
+          requires:
+            - build-jruby-9.4

Matrixfile

@@ -211,9 +211,10 @@
     'rails61-semantic-logger' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
   },
   'action_cable' => {
-    'rails5-mysql2'  => '✅ 2.5 / ✅ 2.6 / ❌ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby',
-    'rails6-mysql2'  => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby',
-    'rails61-mysql2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
+    # FIXME: Enable the test for JRuby after fixing `log writing failed. closed stream` in CircleCI.
+    'rails5-mysql2'  => '✅ 2.5 / ✅ 2.6 / ❌ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ 3.4 / ❌ jruby',
+    'rails6-mysql2'  => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ 3.4 / ❌ jruby',
+    'rails61-mysql2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby'
   },
   'action_mailer' => {
     'rails5-mysql2'  => '✅ 2.5 / ✅ 2.6 / ❌ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby',

appraisal/jruby-9.4.rb

@@ -1,8 +1,6 @@
-# TODO: Actually test JRuby 9.4
-
 appraise 'rails61-mysql2' do
   gem 'rails', '~> 6.1.0'
-  gem 'activerecord-jdbcmysql-adapter', platform: :jruby
+  gem 'activerecord-jdbcmysql-adapter', '~> 61.0', platform: :jruby
   gem 'sprockets', '< 4'
   gem 'lograge', '~> 0.11'
   gem 'net-smtp'
@@ -82,12 +80,12 @@
 end
 
 appraise 'relational_db' do
-  gem 'activerecord', '~> 7'
+  gem 'activerecord', '~> 6.1.0'
   gem 'delayed_job'
   gem 'delayed_job_active_record'
   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 'activerecord-jdbcmysql-adapter', platform: :jruby
-  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+  gem 'activerecord-jdbcmysql-adapter', '~> 61.0', platform: :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0', platform: :jruby
   gem 'sequel', '~> 5.54.0' # TODO: Support sequel 5.62.0+
   gem 'jdbc-sqlite3', '>= 3.28', platform: :jruby
 end