Skip to content
Draft
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
2 changes: 1 addition & 1 deletion .github/workflows/system-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
test:
needs:
- build
uses: DataDog/system-tests/.github/workflows/system-tests.yml@de7effbf9d2afa744933e4366e7a9a3b3c627722 # Automated: This reference is automatically updated.
uses: DataDog/system-tests/.github/workflows/system-tests.yml@6aa1cc6623f8a64aa28b954d9ba2ed27613e6612 # Automated: This reference is automatically updated.
secrets:
TEST_OPTIMIZATION_API_KEY: ${{ secrets.DD_API_KEY }} # key used to pushed test results to test optim
DD_API_KEY: ${{ secrets.DD_API_KEY }} # key used in tests runs
Expand Down
9 changes: 8 additions & 1 deletion .gitlab/install_datadog_deps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

tmp_path = current_path.join('tmp', ENV["ARCH"])

versioned_path = tmp_path.join(ruby_api_version)
versioned_path = tmp_path.join(Gem.ruby_engine, RbConfig::CONFIG['ruby_version'])

FileUtils.mkdir_p(versioned_path, verbose: true)

Expand All @@ -34,6 +34,10 @@
file.write("source 'https://rubygems.org'\n")
file.write("gem 'datadog', '#{ENV.fetch('RUBY_PACKAGE_VERSION')}', path: '#{current_path}'\n")
file.write("gem 'ffi', '1.16.3'\n")

# workaround for https://github.com/ruby/ruby/blob/ruby_2_6/gem_prelude.rb#L3-L7
file.write("gem 'did_you_mean', '1.3.0'\n") if RUBY_VERSION.start_with?('2.6.')

# Mimick outdated `msgpack` version, uncomment below line to test
# file.write("gem 'msgpack', '1.6.0'\n")
end
Expand Down Expand Up @@ -80,6 +84,7 @@

# ADD NEW DEPENDENCIES HERE
[
'did_you_mean',
'datadog-ruby_core_source',
'ffi',
'libddwaf',
Expand All @@ -91,6 +96,8 @@
].each do |gem|
version = gem_version_mapping.delete(gem)

next if version.nil?

gem_install_cmd = "gem install #{gem} "\
"--version #{version} "\
'--no-document '\
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/one-pipeline.locked.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT THIS FILE MANUALLY
# This file is auto-generated by automation.
include:
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/928fb698cf31451f05a180239468e9eb490ac88172a185990df8ca12d2f37d44/one-pipeline.yml
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/da872891924de599f91ff4c66e7351f607852b6de31aac4f2f4f5a300add0a39/one-pipeline.yml
2 changes: 1 addition & 1 deletion .gitlab/prepare-oci-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fi
## Obtain injector source

injector_repo="https://github.com/DataDog/datadog-injector-rb.git"
injector_ref="v1.0.1"
injector_ref="lloeki/deployment-mode"
injector_path="${HOME}/datadog-injector-rb"

git clone "${injector_repo}" --branch "${injector_ref}" "${injector_path}"
Expand Down