Different formatter?

mastodon · May 10, 2024 · 3790fb5 · 3790fb5
1 parent 2da44c9
commit 3790fb5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
@@ -145,8 +145,6 @@ jobs:
       - name: Upload coverage reports to Codecov
         if: matrix.ruby-version == '.ruby-version'
         uses: codecov/codecov-action@v4
-        with:
-          files: coverage/lcov/mastodon.lcov
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

diff --git a/.simplecov b/.simplecov
@@ -4,10 +4,8 @@ SimpleCov.start 'rails' do
   command_name "examples#{ENV.fetch('TEST_ENV_NUMBER', nil)}"
 
   if ENV['CI']
-    require 'simplecov-lcov'
-    SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true
-    formatter SimpleCov::Formatter::LcovFormatter
-    # formatter SimpleCov::Formatter::SimpleFormatter
+    require 'simplecov-cobertura'
+    formatter SimpleCov::Formatter::CoberturaFormatter
   else
     formatter SimpleCov::Formatter::HTMLFormatter
   end

diff --git a/Gemfile b/Gemfile
@@ -158,7 +158,7 @@ group :test do
 
   # Coverage formatter for RSpec test if DISABLE_SIMPLECOV is false
   gem 'simplecov', '~> 0.22', require: false
-  gem 'simplecov-lcov', '~> 0.8', require: false
+  gem 'simplecov-cobertura'
 
   # Stub web requests for specs
   gem 'webmock', '~> 3.18'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -814,8 +814,10 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
+    simplecov-cobertura (2.1.0)
+      rexml
+      simplecov (~> 0.19)
     simplecov-html (0.12.3)
-    simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     stackprof (0.2.26)
     statsd-ruby (1.5.0)
@@ -1041,7 +1043,7 @@ DEPENDENCIES
   simple-navigation (~> 4.4)
   simple_form (~> 5.2)
   simplecov (~> 0.22)
-  simplecov-lcov (~> 0.8)
+  simplecov-cobertura
   stackprof
   stoplight (~> 4.1)
   strong_migrations (= 1.8.0)