-
Notifications
You must be signed in to change notification settings - Fork 381
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into tonycthsu/sidekiq-7
- Loading branch information
Showing
2,338 changed files
with
75,708 additions
and
78,833 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -133,11 +133,11 @@ step_bundle_install: &step_bundle_install | |
| step_rubocop: &step_rubocop | ||
| run: | ||
| name: Delint with Rubocop | ||
| command: bundle exec rake rubocop | ||
| step_sorbet_type_checker: &step_sorbet_type_checker | ||
| run: | ||
| name: Run sorbet type checker | ||
| command: bundle exec rake typecheck | ||
| # There's no straightforward way to get the number of available processors & CPU threads in CircleCI. | ||
| # Currently it always return 18 physical processors and 36 threads, regardless of executor size. | ||
| # The workaround is to use `cpu.shares / 1024`: | ||
| # https://discuss.circleci.com/t/environment-variable-set-to-the-number-of-available-cpus/32670/4 | ||
| command: PARALLEL_PROCESSOR_COUNT=$((`cat /sys/fs/cgroup/cpu/cpu.shares` / 1024)) bundle exec rake rubocop | ||
| step_appraisal_install: &step_appraisal_install | ||
| run: | ||
| name: Install Appraisal gems | ||
|
|
@@ -194,6 +194,8 @@ filters_only_release_tags: &filters_only_release_tags | |
|
|
||
| orbs: | ||
| orb: | ||
| orbs: | ||
| codecov: codecov/[email protected] | ||
| jobs: | ||
| build: | ||
| <<: *test_job_default | ||
|
|
@@ -342,16 +344,6 @@ orbs: | |
| keys: | ||
| - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} | ||
| - *step_rubocop | ||
| sorbet_type_checker: | ||
| <<: *test_job_default | ||
| steps: | ||
| - restore_cache: | ||
| keys: | ||
| - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}' | ||
| - restore_cache: | ||
| keys: | ||
| - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} | ||
| - *step_sorbet_type_checker | ||
| coverage: | ||
| <<: *test_job_default | ||
| steps: | ||
|
|
@@ -364,13 +356,12 @@ orbs: | |
| - attach_workspace: | ||
| at: /tmp/workspace | ||
| - run: | ||
| name: Install codecov | ||
| command: bundle add codecov | ||
| - run: | ||
| name: Generate coverage report artifact "coverage/index.html" | ||
| name: Generate combined coverage report for all tests | ||
| command: COVERAGE_DIR=/tmp/workspace/coverage bundle exec rake coverage:report | ||
| - codecov/upload: | ||
| file: /tmp/workspace/coverage/report/coverage.xml | ||
| - run: | ||
| name: Generate coverage report artifact "coverage/versions/*/index.html" | ||
| name: Generate individual coverage report for each Ruby version | ||
| command: COVERAGE_DIR=/tmp/workspace/coverage bundle exec rake coverage:report_per_ruby_version | ||
| - store_artifacts: | ||
| path: /tmp/workspace/coverage/report/ | ||
|
|
@@ -529,15 +520,10 @@ job_configuration: | |
| resource_class_to_use: medium+ | ||
| - &config-3_2 | ||
| <<: *filters_all_branches_and_tags | ||
| ruby_version: 'ruby-3.2.0-preview3' | ||
| image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-preview3-dd | ||
| ruby_version: 'ruby-3.2.0' | ||
| image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-dd | ||
| resource_class_to_use: medium+ | ||
| # ADD NEW RUBIES HERE | ||
| - &config-jruby-9_2_8_0 # Test with older 9.2 release because 9.2.9.0 changed behavior, see https://github.com/DataDog/dd-trace-rb/pull/1409 | ||
| <<: *filters_all_branches_and_tags | ||
| ruby_version: 'jruby-9.2.8.0' | ||
| image: ghcr.io/datadog/dd-trace-rb/jruby:9.2.8.0-dd | ||
| resource_class_to_use: medium+ | ||
| - &config-jruby-9_2 # More recent release of 9.2 | ||
| <<: *filters_all_branches_and_tags | ||
| ruby_version: 'jruby-9.2.21.0' | ||
|
|
@@ -548,11 +534,6 @@ job_configuration: | |
| ruby_version: 'jruby-9.3.9.0' | ||
| image: ghcr.io/datadog/dd-trace-rb/jruby:9.3.9.0-dd | ||
| resource_class_to_use: medium+ | ||
| - &config-truffleruby-22_3_0 | ||
| <<: *filters_all_branches_and_tags | ||
| ruby_version: 'truffleruby-22.3.0' | ||
| image: ghcr.io/datadog/dd-trace-rb/truffleruby:22.3.0-dd | ||
| resource_class_to_use: medium+ | ||
|
|
||
| workflows: | ||
| version: 2 | ||
|
|
@@ -563,11 +544,6 @@ workflows: | |
| name: lint | ||
| requires: | ||
| - build-2.7 | ||
| - orb/sorbet_type_checker: | ||
| <<: *config-2_7-small | ||
| name: sorbet_type_checker | ||
| requires: | ||
| - build-2.7 | ||
| - orb/coverage: | ||
| <<: *config-2_7-small | ||
| name: coverage | ||
|
|
@@ -581,13 +557,10 @@ workflows: | |
| - test-2.7 | ||
| - test-3.0 | ||
| - test-3.1 | ||
| # TODO: Re-enable once 3.2 testing is green! | ||
| #- test-3.2 | ||
| - test-3.2 | ||
| # ADD NEW RUBIES HERE | ||
| - test-jruby-9.2.8.0 | ||
| - test-jruby-9.2 | ||
| - test-jruby-9.3 | ||
| # soon™️ - test-truffleruby-22.3.0 | ||
| - orb/changelog: | ||
| <<: *config-2_7-small | ||
| name: changelog | ||
|
|
@@ -730,21 +703,12 @@ workflows: | |
| - orb/build: | ||
| <<: *config-3_2 | ||
| name: build-3.2 | ||
| # TODO: Re-enable once 3.2 testing is green! | ||
| # - orb/test: | ||
| # <<: *config-3_2 | ||
| # name: test-3.2 | ||
| # requires: | ||
| # - build-3.2 | ||
| # ADD NEW RUBIES HERE | ||
| - orb/build: | ||
| <<: *config-jruby-9_2_8_0 | ||
| name: build-jruby-9.2.8.0 | ||
| - orb/test: | ||
| <<: *config-jruby-9_2_8_0 | ||
| name: test-jruby-9.2.8.0 | ||
| <<: *config-3_2 | ||
| name: test-3.2 | ||
| requires: | ||
| - build-jruby-9.2.8.0 | ||
| - build-3.2 | ||
| # ADD NEW RUBIES HERE | ||
| - orb/build: | ||
| <<: *config-jruby-9_2 | ||
| name: build-jruby-9.2 | ||
|
|
@@ -761,22 +725,11 @@ workflows: | |
| name: test-jruby-9.3 | ||
| requires: | ||
| - build-jruby-9.3 | ||
| # TruffleRuby | ||
| # soon™️ | ||
| # - orb/build: | ||
| # <<: *config-truffleruby-22_3_0 | ||
| # name: build-truffleruby-22.3.0 | ||
| # - orb/test: | ||
| # <<: *config-truffleruby-22_3_0 | ||
| # name: test-truffleruby-22.3.0 | ||
| # requires: | ||
| # - build-truffleruby-22.3.0 | ||
| # Release jobs | ||
| - "deploy prerelease Gem": | ||
| <<: *filters_all_branches_and_tags | ||
| requires: | ||
| - lint | ||
| - sorbet_type_checker | ||
| - test-2.1 | ||
| - test-2.2 | ||
| - test-2.3 | ||
|
|
@@ -786,18 +739,14 @@ workflows: | |
| - test-2.7 | ||
| - test-3.0 | ||
| - test-3.1 | ||
| # TODO: Re-enable once 3.2 testing is green! | ||
| #- test-3.2 | ||
| - test-3.2 | ||
| # ADD NEW RUBIES HERE | ||
| - test-jruby-9.2.8.0 | ||
| - test-jruby-9.2 | ||
| - test-jruby-9.3 | ||
| # soon™️ - test-truffleruby-22.3.0 | ||
| - "deploy release": | ||
| <<: *filters_only_release_tags | ||
| requires: | ||
| - lint | ||
| - sorbet_type_checker | ||
| - test-2.1 | ||
| - test-2.2 | ||
| - test-2.3 | ||
|
|
@@ -807,13 +756,10 @@ workflows: | |
| - test-2.7 | ||
| - test-3.0 | ||
| - test-3.1 | ||
| # TODO: Re-enable once 3.2 testing is green! | ||
| #- test-3.2 | ||
| - test-3.2 | ||
| # ADD NEW RUBIES HERE | ||
| - test-jruby-9.2.8.0 | ||
| - test-jruby-9.2 | ||
| - test-jruby-9.3 | ||
| # soon™️ - test-truffleruby-22.3.0 | ||
| # This workflow runs the same `build` and `test` jobs as above on a schedule. | ||
| # Tasks related to housekeeping (e.g. prerelease) are not relevant | ||
| # to this daily check, as they are not expected to be impacted here. | ||
|
|
@@ -968,22 +914,12 @@ workflows: | |
| <<: *config-3_2 | ||
| name: build-3.2 | ||
| edge: true | ||
| # TODO: Re-enable once 3.2 testing is green! | ||
| # - orb/test: | ||
| # <<: *config-3_2 | ||
| # name: test-3.2 | ||
| # requires: | ||
| # - build-3.2 | ||
| # ADD NEW RUBIES HERE | ||
| - orb/build: | ||
| <<: *config-jruby-9_2_8_0 | ||
| name: build-jruby-9.2.8.0 | ||
| edge: true | ||
| - orb/test: | ||
| <<: *config-jruby-9_2_8_0 | ||
| name: test-jruby-9.2.8.0 | ||
| <<: *config-3_2 | ||
| name: test-3.2 | ||
| requires: | ||
| - build-jruby-9.2.8.0 | ||
| - build-3.2 | ||
| # ADD NEW RUBIES HERE | ||
| - orb/build: | ||
| <<: *config-jruby-9_2 | ||
| name: build-jruby-9.2 | ||
|
|
@@ -1002,14 +938,3 @@ workflows: | |
| name: test-jruby-9.3 | ||
| requires: | ||
| - build-jruby-9.3 | ||
| # TruffleRuby | ||
| # soon™️ | ||
| # - orb/build: | ||
| # <<: *config-truffleruby-22_3_0 | ||
| # name: build-truffleruby-22.3.0 | ||
| # edge: true | ||
| # - orb/test: | ||
| # <<: *config-truffleruby-22_3_0 | ||
| # name: test-truffleruby-22.3.0 | ||
| # requires: | ||
| # - build-truffleruby-22.3.0 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.