Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions .github/workflows/lock-dependency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,31 @@ jobs:
engine:
# ADD NEW RUBIES HERE
- name: ruby
version: '3.5'
version: "3.5"
- name: ruby
version: '3.4'
version: "3.4"
- name: ruby
version: '3.3'
version: "3.3"
- name: ruby
version: '3.2'
version: "3.2"
- name: ruby
version: '3.1'
version: "3.1"
- name: ruby
version: '3.0'
version: "3.0"
- name: ruby
version: '2.7'
version: "2.7"
- name: ruby
version: '2.6'
version: "2.6"
- name: ruby
version: '2.5'
version: "2.5"
- name: jruby
version: '9.4'
version: "9.4"
- name: jruby
version: '9.3'
version: "9.3"
- name: jruby
version: '9.2'
version: "9.2"
- name: jruby
version: '10.0'
version: "10.0"
container:
image: ghcr.io/datadog/images-rb/engines/${{ matrix.engine.name }}:${{ matrix.engine.version }}-gnu-gcc
env:
Expand Down Expand Up @@ -103,13 +103,17 @@ jobs:
path: gemfiles
pattern: lock-dependency-${{ github.run_id }}-*
merge-multiple: true
- run: git diff --color=always
# FIXME: The ghcommit-action does not pick up untracked/unstaged files
# https://github.com/planetscale/ghcommit-action/issues/43
- name: Stage changes
run: git add gemfiles
- run: git diff --cached --color=always
- name: Commit changes
uses: planetscale/ghcommit-action@f24050e41f8694750427d111b52f4ef9ca81a32d # v0.2.18
with:
repo: ${{ github.repository }}
branch: ${{ github.head_ref }}
file_pattern: 'gemfiles/*'
file_pattern: "gemfiles/*"
commit_message: "[🤖] Lock Dependency: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
env:
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
Expand Down
4 changes: 4 additions & 0 deletions Matrixfile
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,10 @@
'rails61-mysql2' => '❌ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ 3.5 / ❌ jruby',
'rails8-mysql2' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ❌ 3.0 / ❌ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 3.5 / ❌ jruby',
},
'open_feature' => {
'openfeature-latest' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ❌ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 3.5 / ❌ jruby',
'openfeature-min' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ❌ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 3.5 / ❌ jruby',
},
}.each_with_object({}) do |(tasks, spec_metadata), hash|
# Explode arrays of task names into individual tasks
# e.g. ['rails', 'railsdisableenv'] => {'...'} becomes 'rails7' => {'...'}, 'railsdisableenv7' => {'...'}
Expand Down
12 changes: 9 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ namespace :spec do
:graphql, :graphql_unified_trace_patcher, :graphql_trace_patcher, :graphql_tracing_patcher,
:rails, :railsredis, :railsredis_activesupport, :railsactivejob,
:elasticsearch, :http, :redis, :sidekiq, :sinatra, :hanami, :hanami_autoinstrument,
:profiling, :core_with_libdatadog_api, :error_tracking]
:profiling, :core_with_libdatadog_api, :error_tracking, :open_feature]

desc '' # "Explicitly hiding from `rake -T`"
RSpec::Core::RakeTask.new(:main) do |t, args|
t.pattern = 'spec/**/*_spec.rb'
t.exclude_pattern = 'spec/**/{appsec/integration,contrib,benchmark,redis,auto_instrument,opentelemetry,profiling,crashtracking,error_tracking,rubocop,data_streams}/**/*_spec.rb,' \
' spec/**/{auto_instrument,opentelemetry,process_discovery,stable_config,ddsketch}*_spec.rb,' \
t.exclude_pattern = 'spec/**/{appsec/integration,contrib,benchmark,redis,auto_instrument,opentelemetry,open_feature,profiling,crashtracking,error_tracking,rubocop,data_streams}/**/*_spec.rb,' \
' spec/**/{auto_instrument,opentelemetry,process_discovery,stable_config,ddsketch}_spec.rb,' \
' spec/datadog/gem_packaging_spec.rb'
t.rspec_opts = args.to_a.join(' ')
end
Expand Down Expand Up @@ -133,6 +133,12 @@ namespace :spec do
t.rspec_opts = args.to_a.join(' ')
end

desc '' # "Explicitly hiding from `rake -T`"
RSpec::Core::RakeTask.new(:open_feature) do |t, args|
t.pattern = 'spec/datadog/open_feature/**/*_spec.rb,spec/datadog/open_feature_spec.rb'
t.rspec_opts = args.to_a.join(' ')
end

desc '' # "Explicitly hiding from `rake -T`"
RSpec::Core::RakeTask.new(:rails) do |t, args|
t.pattern = 'spec/datadog/tracing/contrib/rails/**/*_spec.rb'
Expand Down
1 change: 1 addition & 0 deletions appraisal/ruby-3.1.rb
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
build_coverage_matrix('dalli', [2])
build_coverage_matrix('karafka', min: '2.3.0')
build_coverage_matrix('devise', min: '3.2.1')
build_coverage_matrix('openfeature', min: '0.3.1', gem: 'openfeature-sdk')

appraise 'relational_db' do
gem 'activerecord', '~> 7'
Expand Down
1 change: 1 addition & 0 deletions appraisal/ruby-3.2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
build_coverage_matrix('dalli', [2])
build_coverage_matrix('karafka', min: '2.3.0')
build_coverage_matrix('devise', min: '3.2.1')
build_coverage_matrix('openfeature', min: '0.3.1', gem: 'openfeature-sdk')

appraise 'relational_db' do
gem 'activerecord', '~> 7'
Expand Down
1 change: 1 addition & 0 deletions appraisal/ruby-3.3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
build_coverage_matrix('dalli', [2])
build_coverage_matrix('karafka', min: '2.3.0')
build_coverage_matrix('devise', min: '3.2.1')
build_coverage_matrix('openfeature', min: '0.3.1', gem: 'openfeature-sdk')

appraise 'relational_db' do
gem 'activerecord', '~> 7'
Expand Down
1 change: 1 addition & 0 deletions appraisal/ruby-3.4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
build_coverage_matrix('dalli', [2])
build_coverage_matrix('karafka', min: '2.3.0')
build_coverage_matrix('devise', min: '3.2.1')
build_coverage_matrix('openfeature', min: '0.3.1', gem: 'openfeature-sdk')

appraise 'relational_db' do
# ActiveRecord locked because tests are failing with 7.1, which was attempted as a part of Ruby 3.4 testing in CI.
Expand Down
1 change: 1 addition & 0 deletions appraisal/ruby-3.5.rb
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
build_coverage_matrix('dalli', [2])
build_coverage_matrix('karafka', min: '2.3.0')
build_coverage_matrix('devise', min: '3.2.1')
build_coverage_matrix('openfeature', min: '0.3.1', gem: 'openfeature-sdk')

appraise 'relational_db' do
# ActiveRecord locked because tests are failing with 7.1, which was attempted as a part of Ruby 3.4 testing in CI.
Expand Down
38 changes: 38 additions & 0 deletions gemfiles/ruby_3.1_openfeature_latest.gemfile

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

181 changes: 181 additions & 0 deletions gemfiles/ruby_3.1_openfeature_latest.gemfile.lock

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

Loading
Loading