Skip to content

Commit

Permalink
Add gem to gemspec and remove from Gemfile
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahchen6 committed Oct 21, 2024
1 parent 4307a7f commit c2cf21b
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitlab/install_datadog_deps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
}

[
# 'datadog-ruby_core_source',
'datadog-ruby_core_source',
'ffi',
'libddwaf',
'msgpack',
Expand Down
3 changes: 0 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,3 @@ end
#
# TODO: Remove this once the issue is resolved: https://github.com/ffi/ffi/issues/1107
gem 'ffi', '~> 1.16.3', require: false

# TODO: Remove when datadog-ruby_core_source has officially been published as a gem
gem 'datadog-ruby_core_source', git: 'https://github.com/DataDog/datadog-ruby_core_source'
3 changes: 1 addition & 2 deletions datadog.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ Gem::Specification.new do |spec|
# Used by the profiler native extension to support Ruby < 2.6 and > 3.2
#
# We decided to pin it at the latest available version and will manually bump the dependency as needed.
# Uncomment when datadog-ruby_core_source has officially been published as a gem
# spec.add_dependency 'datadog-ruby_core_source', '= 3.6.3'
spec.add_dependency 'datadog-ruby_core_source', '= 3.3.6'

# Used by appsec
spec.add_dependency 'libddwaf', '~> 1.14.0.0.0'
Expand Down
2 changes: 1 addition & 1 deletion lib-injection/host_inject.rb
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def bundler_supported?
[
'msgpack',
'ffi',
# 'datadog-ruby_core_source',
'datadog-ruby_core_source',
'libdatadog',
'libddwaf',
'datadog'
Expand Down
2 changes: 1 addition & 1 deletion spec/datadog/release_gem_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
# This list MUST NOT derive from the `gemspec.dependencies`,
# since it is used to alarm when dependencies modified.
'datadog',
# 'datadog-ruby_core_source',
'datadog-ruby_core_source',
'ffi',
'libdatadog',
'libddwaf',
Expand Down

0 comments on commit c2cf21b

Please sign in to comment.