Merge pull request #4276 from DataDog/tonycthsu/rubocop-group

Cleanup dependencies by moving rubocop to check group
DataDog · Jan 10, 2025 · 7c02a1c · 7c02a1c
2 parents 42a7173 + 76c0d81
commit 7c02a1c
Show file tree

Hide file tree

Showing 906 changed files with 72 additions and 17,925 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -65,7 +65,7 @@ save_bundle_checksum: &save_bundle_checksum
     command: |
       if [ "$CI_BUNDLE_CACHE_HIT" != 1 ]; then
         # Recompute gemfiles/*.lock checksum, as those files might have changed
-        cat Gemfile Gemfile.lock ruby-*.gemfile gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
+        cat Gemfile Gemfile.lock jruby-*.gemfile ruby-*.gemfile gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
       fi
       cp .circleci/bundle_checksum /usr/local/bundle/bundle_checksum
 step_bundle_install: &step_bundle_install
@@ -96,7 +96,7 @@ step_compute_bundle_checksum: &step_compute_bundle_checksum
     # updating the gemset lock files produces extremely large commits.
     command: |
       bundle lock # Create Gemfile.lock
-      cat Gemfile Gemfile.lock ruby-*.gemfile gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
+      cat Gemfile Gemfile.lock jruby-*.gemfile ruby-*.gemfile gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
 step_get_test_agent_trace_check_results: &step_get_test_agent_trace_check_results
   run:
     name: Get APM Test Agent Trace Check Results

diff --git a/gemfiles/jruby_9.3_activesupport.gemfile b/gemfiles/jruby_9.3_activesupport.gemfile
diff --git a/gemfiles/jruby_9.3_activesupport.gemfile.lock b/gemfiles/jruby_9.3_activesupport.gemfile.lock
diff --git a/gemfiles/jruby_9.3_aws.gemfile b/gemfiles/jruby_9.3_aws.gemfile
diff --git a/gemfiles/jruby_9.3_aws.gemfile.lock b/gemfiles/jruby_9.3_aws.gemfile.lock
diff --git a/gemfiles/jruby_9.3_contrib.gemfile b/gemfiles/jruby_9.3_contrib.gemfile
diff --git a/gemfiles/jruby_9.3_contrib.gemfile.lock b/gemfiles/jruby_9.3_contrib.gemfile.lock
diff --git a/gemfiles/jruby_9.3_contrib_old.gemfile b/gemfiles/jruby_9.3_contrib_old.gemfile