Merge pull request #3918 from DataDog/tonycthsu/fix-yard

Fix Yard Github action
DataDog · Sep 18, 2024 · a0b9273 · a0b9273
2 parents e32e038 + c20934b
commit a0b9273
Show file tree

Hide file tree

Showing 957 changed files with 35 additions and 1,758 deletions.
diff --git a/.github/workflows/yard.yml b/.github/workflows/yard.yml
@@ -25,15 +25,18 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/datadog/images-rb/engines/ruby:3.2
+      env:
+        BUNDLE_GEMFILE: tools/yard.gemfile
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.2'
-          bundler-cache: true
+      - run: ls -al
+      - name: Bundle
+        run: bundle install
       - name: Generate YARD documentation
-        run: bundle exec rake docs
+        run: bundle exec rake docs --rakefile=tasks/yard.rake
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - name: Upload artifact

diff --git a/.standard_todo.yml b/.standard_todo.yml
@@ -41,4 +41,5 @@ ignore:
 - spec/datadog/tracing/**/**
 - spec/support/**/**
 - tasks/**/**
+- tools/**/**
 - yard/**/**
diff --git a/Gemfile b/Gemfile
@@ -51,8 +51,6 @@ elsif RUBY_VERSION >= '3.0.0' # No longer bundled by default since Ruby 3.0
   gem 'webrick', '>= 1.7.0'
 end
 
-gem 'yard', '~> 0.9' # NOTE: YardDoc is generated with ruby 3.2 in GitHub Actions
-
 if RUBY_VERSION >= '2.6.0'
   # 1.50 is the last version to support Ruby 2.6
   gem 'rubocop', '~> 1.50.0', require: false

diff --git a/Rakefile b/Rakefile
@@ -4,7 +4,6 @@ require 'rubocop/rake_task' if Gem.loaded_specs.key? 'rubocop'
 require 'standard/rake' if Gem.loaded_specs.key? 'standard'
 require 'rspec/core/rake_task'
 require 'rake/extensiontask'
-require 'yard'
 require 'os'
 if Gem.loaded_specs.key? 'ruby_memcheck'
   require 'ruby_memcheck'
@@ -371,17 +370,6 @@ if defined?(RuboCop::RakeTask)
   end
 end
 
-YARD::Rake::YardocTask.new(:docs) do |t|
-  # Options defined in `.yardopts` are read first, then merged with
-  # options defined here.
-  #
-  # It's recommended to define options in `.yardopts` instead of here,
-  # as `.yardopts` can be read by external YARD tools, like the
-  # hot-reload YARD server `yard server --reload`.
-
-  t.options += ['--title', "datadog #{Datadog::VERSION::STRING} documentation"]
-end
-
 # Jobs are parallelized if running in CI.
 desc 'CI task; it runs all tests for current version of Ruby'
 task ci: 'test:all'

diff --git a/gemfiles/jruby_9.2_activesupport.gemfile b/gemfiles/jruby_9.2_activesupport.gemfile
diff --git a/gemfiles/jruby_9.2_activesupport.gemfile.lock b/gemfiles/jruby_9.2_activesupport.gemfile.lock
diff --git a/gemfiles/jruby_9.2_aws.gemfile b/gemfiles/jruby_9.2_aws.gemfile
diff --git a/gemfiles/jruby_9.2_aws.gemfile.lock b/gemfiles/jruby_9.2_aws.gemfile.lock
diff --git a/gemfiles/jruby_9.2_contrib.gemfile b/gemfiles/jruby_9.2_contrib.gemfile
diff --git a/gemfiles/jruby_9.2_contrib.gemfile.lock b/gemfiles/jruby_9.2_contrib.gemfile.lock
diff --git a/gemfiles/jruby_9.2_contrib_old.gemfile b/gemfiles/jruby_9.2_contrib_old.gemfile
diff --git a/gemfiles/jruby_9.2_contrib_old.gemfile.lock b/gemfiles/jruby_9.2_contrib_old.gemfile.lock
diff --git a/gemfiles/jruby_9.2_core_old.gemfile b/gemfiles/jruby_9.2_core_old.gemfile
diff --git a/gemfiles/jruby_9.2_core_old.gemfile.lock b/gemfiles/jruby_9.2_core_old.gemfile.lock
diff --git a/gemfiles/jruby_9.2_elasticsearch_7.gemfile b/gemfiles/jruby_9.2_elasticsearch_7.gemfile
diff --git a/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock
diff --git a/gemfiles/jruby_9.2_elasticsearch_8.gemfile b/gemfiles/jruby_9.2_elasticsearch_8.gemfile
diff --git a/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock
diff --git a/gemfiles/jruby_9.2_graphql_2.0.gemfile b/gemfiles/jruby_9.2_graphql_2.0.gemfile
diff --git a/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock b/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock
diff --git a/gemfiles/jruby_9.2_http.gemfile b/gemfiles/jruby_9.2_http.gemfile
diff --git a/gemfiles/jruby_9.2_http.gemfile.lock b/gemfiles/jruby_9.2_http.gemfile.lock
diff --git a/gemfiles/jruby_9.2_opensearch_2.gemfile b/gemfiles/jruby_9.2_opensearch_2.gemfile
diff --git a/gemfiles/jruby_9.2_opensearch_2.gemfile.lock b/gemfiles/jruby_9.2_opensearch_2.gemfile.lock
diff --git a/gemfiles/jruby_9.2_opensearch_3.gemfile b/gemfiles/jruby_9.2_opensearch_3.gemfile
diff --git a/gemfiles/jruby_9.2_opensearch_3.gemfile.lock b/gemfiles/jruby_9.2_opensearch_3.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rack_1.gemfile b/gemfiles/jruby_9.2_rack_1.gemfile
diff --git a/gemfiles/jruby_9.2_rack_1.gemfile.lock b/gemfiles/jruby_9.2_rack_1.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rack_2.gemfile b/gemfiles/jruby_9.2_rack_2.gemfile
diff --git a/gemfiles/jruby_9.2_rack_2.gemfile.lock b/gemfiles/jruby_9.2_rack_2.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rack_3.gemfile b/gemfiles/jruby_9.2_rack_3.gemfile