Skip to content

Commit

Permalink
Merge pull request #4114 from DataDog/sarahchen6/circleci-take-3
Browse files Browse the repository at this point in the history
Add Ruby 3.4 support to CircleCI
  • Loading branch information
sarahchen6 authored Nov 15, 2024
2 parents d39fe33 + 80fea2e commit 0996039
Show file tree
Hide file tree
Showing 99 changed files with 1,020 additions and 441 deletions.
19 changes: 19 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,11 @@ job_configuration:
ruby_version: 'ruby-3.3.0'
image: ghcr.io/datadog/images-rb/engines/ruby:3.3
resource_class_to_use: medium+
- &config-3_4
<<: *filters_all_branches_and_tags
ruby_version: 'ruby-3.4.0'
image: ghcr.io/datadog/images-rb/engines/ruby:3.4
resource_class_to_use: medium+
# ADD NEW RUBIES HERE
- &config-jruby-9_2 # More recent release of 9.2
<<: *filters_all_branches_and_tags
Expand Down Expand Up @@ -456,6 +461,7 @@ workflows:
- test-3.1
- test-3.2
- test-3.3
- test-3.4
# ADD NEW RUBIES HERE
- test-jruby-9.2
- test-jruby-9.3
Expand Down Expand Up @@ -504,6 +510,11 @@ workflows:
integration_apps: 'rack rails-six rails-seven sinatra2-classic sinatra2-modular'
ruby_version: '3.3'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-3.4
integration_apps: 'rack rails-six rails-seven sinatra2-classic sinatra2-modular'
ruby_version: '3.4'
<<: *filters_all_branches_and_tags
# ⬆️ **Note**: If add/remove test apps above, remember to also copy-paste the changes to the "edge" workflow further down the file.
#
# ADD NEW RUBIES HERE
Expand Down Expand Up @@ -563,6 +574,14 @@ workflows:
name: test-3.3
requires:
- build-3.3
- orb/build:
<<: *config-3_4
name: build-3.4
- orb/test:
<<: *config-3_4
name: test-3.4
requires:
- build-3.4
# ADD NEW RUBIES HERE
- orb/build:
<<: *config-jruby-9_2
Expand Down
11 changes: 9 additions & 2 deletions appraisal/ruby-3.4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,20 @@
build_coverage_matrix('elasticsearch', 7..8)

appraise 'relational_db' do
gem 'activerecord', '~> 7'
# ActiveRecord locked because tests are failing with 7.1, which was attempted as a part of Ruby 3.4 testing in CI.
# All existing relational_db configurations use ActiveRecord 7.0. ActiveRecord 7.1 is tested as a part of rails71
# appraisal configurations. The latest version of sqlite3 (i.e. 2+) requires ActiveRecord 7.1, so sqlite3 version
# has been locked as well.
#
# TODO: Repair the failures with ActiveRecord 7.1 in this configuration and remove the locked version.
# TODO: After ActiveRecord is upgraded to 7.1+, sqlite3 can be unlocked as well.
gem 'activerecord', '~> 7.0.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 'mysql2', '>= 0.5.3', platform: :ruby
gem 'pg', platform: :ruby
gem 'sqlite3', '>= 1.4.2', platform: :ruby
gem 'sqlite3', '~> 1.4', platform: :ruby
gem 'sequel'
gem 'trilogy'
end
Expand Down
7 changes: 6 additions & 1 deletion gemfiles/ruby_3.4_activesupport.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 12 additions & 7 deletions gemfiles/ruby_3.4_activesupport.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion gemfiles/ruby_3.4_aws.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 14 additions & 7 deletions gemfiles/ruby_3.4_aws.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion gemfiles/ruby_3.4_contrib.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 13 additions & 7 deletions gemfiles/ruby_3.4_contrib.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0996039

Please sign in to comment.