Merge branch 'master' into di-rest-2

DataDog · Nov 25, 2024 · 5fe2b77 · 5fe2b77
2 parents 4683a48 + 0d88e2a
commit 5fe2b77
Show file tree

Hide file tree

Showing 46 changed files with 340 additions and 197 deletions.
diff --git a/.github/workflows/update-latest-dependency.yml b/.github/workflows/update-latest-dependency.yml
@@ -13,7 +13,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     permissions:
-        contents: read
+      contents: read
     strategy:
         fail-fast: false
         matrix:
@@ -80,6 +80,7 @@ jobs:
       - run: git diff
 
       - name: Create Pull Request
+        id: cpr
         uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GHA_PAT }}
@@ -93,3 +94,10 @@ jobs:
             _This is an auto-generated PR from [here](https://github.com/DataDog/dd-trace-rb/blob/master/.github/workflows/update-latest-dependency.yml), which creates a pull request that will be continually updated with new changes until it is merged or closed)_
 
             The PR updates latest versions of defined dependencies. Please review the changes and merge when ready.
+
+      - name: Enable Pull Request Automerge
+        if: steps.cpr.outputs.pull-request-operation == 'created'
+        uses: peter-evans/enable-pull-request-automerge@v3
+        with:
+          token: ${{ secrets.GHA_PAT }}
+          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
diff --git a/gemfiles/jruby_9.2_stripe_latest.gemfile.lock b/gemfiles/jruby_9.2_stripe_latest.gemfile.lock
diff --git a/gemfiles/jruby_9.3_stripe_latest.gemfile.lock b/gemfiles/jruby_9.3_stripe_latest.gemfile.lock
diff --git a/gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock b/gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock
diff --git a/gemfiles/jruby_9.4_elasticsearch_8.gemfile.lock b/gemfiles/jruby_9.4_elasticsearch_8.gemfile.lock
diff --git a/gemfiles/jruby_9.4_elasticsearch_latest.gemfile.lock b/gemfiles/jruby_9.4_elasticsearch_latest.gemfile.lock
diff --git a/gemfiles/jruby_9.4_opensearch_2.gemfile.lock b/gemfiles/jruby_9.4_opensearch_2.gemfile.lock
diff --git a/gemfiles/jruby_9.4_opensearch_3.gemfile.lock b/gemfiles/jruby_9.4_opensearch_3.gemfile.lock
diff --git a/gemfiles/jruby_9.4_opensearch_latest.gemfile.lock b/gemfiles/jruby_9.4_opensearch_latest.gemfile.lock
diff --git a/gemfiles/jruby_9.4_stripe_latest.gemfile.lock b/gemfiles/jruby_9.4_stripe_latest.gemfile.lock
diff --git a/gemfiles/ruby_2.5_stripe_latest.gemfile.lock b/gemfiles/ruby_2.5_stripe_latest.gemfile.lock
diff --git a/gemfiles/ruby_2.6_stripe_latest.gemfile.lock b/gemfiles/ruby_2.6_stripe_latest.gemfile.lock
diff --git a/gemfiles/ruby_2.7_stripe_latest.gemfile.lock b/gemfiles/ruby_2.7_stripe_latest.gemfile.lock
diff --git a/gemfiles/ruby_3.0_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.0_elasticsearch_7.gemfile.lock
diff --git a/gemfiles/ruby_3.0_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.0_elasticsearch_8.gemfile.lock
diff --git a/gemfiles/ruby_3.0_elasticsearch_latest.gemfile.lock b/gemfiles/ruby_3.0_elasticsearch_latest.gemfile.lock
diff --git a/gemfiles/ruby_3.0_opensearch_2.gemfile.lock b/gemfiles/ruby_3.0_opensearch_2.gemfile.lock
diff --git a/gemfiles/ruby_3.0_opensearch_3.gemfile.lock b/gemfiles/ruby_3.0_opensearch_3.gemfile.lock
diff --git a/gemfiles/ruby_3.0_opensearch_latest.gemfile.lock b/gemfiles/ruby_3.0_opensearch_latest.gemfile.lock
diff --git a/gemfiles/ruby_3.0_stripe_latest.gemfile.lock b/gemfiles/ruby_3.0_stripe_latest.gemfile.lock