Merge branch 'main' into dependabot-github_actions-actions-checkout-4

dpep · Sep 19, 2023 · f435301 · f435301
2 parents 2cd4c42 + 47a6c96
commit f435301
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -13,7 +13,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- ruby-version: [ 3.1, 3.0, 2.7 ]
+ ruby-version: [ 3.1, "3.0", 2.7 ]
 
  name: Ruby ${{ matrix.ruby-version }}
 
@@ -27,3 +27,5 @@ jobs:
  bundler-cache: true
  - name: run tests
  run: bundle exec rspec
+ - name: upload code coverage
+ uses: codecov/codecov-action@v3
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,9 +8,6 @@ GEM
  specs:
  base64 (0.1.1)
  byebug (11.1.3)
- codecov (0.2.12)
- json
- simplecov
  connection_pool (2.4.1)
  ddtrace (1.14.0)
  debase-ruby_core_source (= 3.2.1)
@@ -29,7 +26,6 @@ GEM
  faraday-rack (2.0.0)
  faraday (~> 2.0)
  ffi (1.15.5)
- json (2.6.3)
  libdatadog (3.0.0.1.0)
  libddwaf (1.9.0.0.1)
  ffi (~> 1.0)
@@ -67,7 +63,6 @@ PLATFORMS
 
 DEPENDENCIES
  byebug
- codecov
  ddtrace (>= 1)
  dogstatsd-ruby (<= 4.8.3)
  faraday

diff --git a/network_resiliency.gemspec b/network_resiliency.gemspec
@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
  s.version = package.const_get "VERSION"
 
  s.add_development_dependency "byebug"
- s.add_development_dependency "codecov"
  s.add_development_dependency "ddtrace", ">= 1"
  s.add_development_dependency "dogstatsd-ruby", "<= 4.8.3"
  s.add_development_dependency "faraday"

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -8,8 +8,8 @@
 end
 
 if ENV["CI"] == "true" || ENV["CODECOV_TOKEN"]
- require "codecov"
- SimpleCov.formatter = SimpleCov::Formatter::Codecov
+ require "simplecov_json_formatter"
+ SimpleCov.formatter = SimpleCov::Formatter::JSONFormatter
 end
 
 # load this gem