Skip to content

Commit

Permalink
Merge branch 'master' into add-http-route
Browse files Browse the repository at this point in the history
  • Loading branch information
y9v committed Aug 30, 2024
2 parents 4b6f5ed + 9e00232 commit 8a42cc1
Show file tree
Hide file tree
Showing 248 changed files with 15,614 additions and 237 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/system-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
- name: proxy
internal: datadog/system-tests:proxy-v1
runs-on: ubuntu-latest
permissions:
packages: write
name: Build (${{ matrix.image.name }})
steps:
- name: Checkout
Expand Down Expand Up @@ -101,6 +103,8 @@ jobs:
- graphql23
runs-on: ubuntu-latest
name: Build (${{ matrix.app }})
permissions:
packages: write
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-memory-leaks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
bundler: latest
cache-version: v1 # bump this to invalidate cache
- run: sudo apt install -y valgrind && valgrind --version
- run: sudo apt update && sudo apt install -y valgrind && valgrind --version
- run: bundle exec rake compile spec:profiling:memcheck
test-asan:
runs-on: ubuntu-24.04
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/update-gemfiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
check:
name: Update Gemfiles
runs-on: ubuntu-22.04
permissions:
contents: write
pull-requests: write
steps:
# Only execute if there's a PR attached to this branch.
# Because we execute on `push`, we have to double check here if this is part of a PR.
Expand Down
7 changes: 6 additions & 1 deletion Matrixfile
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,12 @@
'contrib' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
},
'stripe' => {
'http' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
'stripe-12' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'stripe-11' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'stripe-10' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'stripe-9' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'stripe-8' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'stripe-7' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
},
'sucker_punch' => {
'contrib' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
Expand Down
7 changes: 6 additions & 1 deletion appraisal/jruby-9.2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,15 @@
gem 'http', '~> 4' # TODO: Fix test breakage and flakiness for 5+
gem 'httpclient'
gem 'rest-client'
gem 'stripe', '~> 7.0'
gem 'typhoeus'
end

(7..12).each do |n|
appraise "stripe-#{n}" do
gem 'stripe', "~> #{n}"
end
end

[2, 3].each do |n|
appraise "opensearch-#{n}" do
gem 'opensearch-ruby', "~> #{n}"
Expand Down
7 changes: 6 additions & 1 deletion appraisal/jruby-9.3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,15 @@
gem 'http', '~> 4' # TODO: Fix test breakage and flakiness for 5+
gem 'httpclient'
gem 'rest-client'
gem 'stripe', '~> 8.0'
gem 'typhoeus'
end

(7..12).each do |n|
appraise "stripe-#{n}" do
gem 'stripe', "~> #{n}"
end
end

[2, 3].each do |n|
appraise "opensearch-#{n}" do
gem 'opensearch-ruby', "~> #{n}"
Expand Down
7 changes: 6 additions & 1 deletion appraisal/jruby-9.4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,15 @@
gem 'http', '~> 4' # TODO: Completely broken with this JRuby version, this has not be validate on CI
gem 'httpclient'
gem 'rest-client'
gem 'stripe'
gem 'typhoeus'
end

(7..12).each do |n|
appraise "stripe-#{n}" do
gem 'stripe', "~> #{n}"
end
end

[2, 3].each do |n|
appraise "opensearch-#{n}" do
gem 'opensearch-ruby', "~> #{n}"
Expand Down
7 changes: 6 additions & 1 deletion appraisal/ruby-2.5.rb
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,15 @@
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'stripe', '~> 7.0'
gem 'typhoeus'
end

(7..12).each do |n|
appraise "stripe-#{n}" do
gem 'stripe', "~> #{n}"
end
end

[2, 3].each do |n|
appraise "opensearch-#{n}" do
gem 'opensearch-ruby', "~> #{n}"
Expand Down
7 changes: 6 additions & 1 deletion appraisal/ruby-2.6.rb
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,15 @@
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'stripe', '~> 8.0'
gem 'typhoeus'
end

(7..12).each do |n|
appraise "stripe-#{n}" do
gem 'stripe', "~> #{n}"
end
end

[2, 3].each do |n|
appraise "opensearch-#{n}" do
gem 'opensearch-ruby', "~> #{n}"
Expand Down
7 changes: 6 additions & 1 deletion appraisal/ruby-2.7.rb
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,15 @@
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'stripe'
gem 'typhoeus'
end

(7..12).each do |n|
appraise "stripe-#{n}" do
gem 'stripe', "~> #{n}"
end
end

[2, 3].each do |n|
appraise "opensearch-#{n}" do
gem 'opensearch-ruby', "~> #{n}"
Expand Down
7 changes: 6 additions & 1 deletion appraisal/ruby-3.0.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,15 @@
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'stripe'
gem 'typhoeus'
end

(7..12).each do |n|
appraise "stripe-#{n}" do
gem 'stripe', "~> #{n}"
end
end

[2, 3].each do |n|
appraise "opensearch-#{n}" do
gem 'opensearch-ruby', "~> #{n}"
Expand Down
7 changes: 6 additions & 1 deletion appraisal/ruby-3.1.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,15 @@
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'stripe'
gem 'typhoeus'
end

(7..12).each do |n|
appraise "stripe-#{n}" do
gem 'stripe', "~> #{n}"
end
end

[2, 3].each do |n|
appraise "opensearch-#{n}" do
gem 'opensearch-ruby', "~> #{n}"
Expand Down
7 changes: 6 additions & 1 deletion appraisal/ruby-3.2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,15 @@
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'stripe'
gem 'typhoeus'
end

(7..12).each do |n|
appraise "stripe-#{n}" do
gem 'stripe', "~> #{n}"
end
end

[2, 3].each do |n|
appraise "opensearch-#{n}" do
gem 'opensearch-ruby', "~> #{n}"
Expand Down
7 changes: 6 additions & 1 deletion appraisal/ruby-3.3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,15 @@
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'stripe'
gem 'typhoeus'
end

(7..12).each do |n|
appraise "stripe-#{n}" do
gem 'stripe', "~> #{n}"
end
end

[2, 3].each do |n|
appraise "opensearch-#{n}" do
gem 'opensearch-ruby', "~> #{n}"
Expand Down
7 changes: 6 additions & 1 deletion appraisal/ruby-3.4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,15 @@
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'stripe'
gem 'typhoeus'
end

(7..12).each do |n|
appraise "stripe-#{n}" do
gem 'stripe', "~> #{n}"
end
end

[2, 3].each do |n|
appraise "opensearch-#{n}" do
gem 'opensearch-ruby', "~> #{n}"
Expand Down
1 change: 0 additions & 1 deletion gemfiles/jruby_9.2_http.gemfile

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

2 changes: 0 additions & 2 deletions gemfiles/jruby_9.2_http.gemfile.lock

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

41 changes: 41 additions & 0 deletions gemfiles/jruby_9.2_stripe_10.gemfile

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

Loading

0 comments on commit 8a42cc1

Please sign in to comment.