diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1be6a0d2dd..744694e071 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -153,3 +153,20 @@ jobs: TEST_WORKER: ${{ matrix.worker }} TEST_WORKERS: 4 run: .github/spec_runner.sh + + - name: Coveralls Parallel + uses: coverallsapp/github-action@v2 + with: + flag-name: ${{ join(matrix.*, '-') }}-run + parallel: true + + finish: + needs: build + if: ${{ always() }} + runs-on: ubuntu-latest + steps: + - name: Coveralls Finished + uses: coverallsapp/github-action@v2 + with: + parallel-finished: true + carryforward: "worker-0-run,worker-1-run,worker-2-run,worker-3-run" \ No newline at end of file diff --git a/Gemfile b/Gemfile index da2f75f950..0f5c52d307 100644 --- a/Gemfile +++ b/Gemfile @@ -210,8 +210,8 @@ end group :test do gem 'rspec', '~> 3.6' - gem 'codecov', '~> 0.6.0' - gem 'simplecov', require: false + gem 'simplecov', '~> 0.22.0', require: false + gem 'simplecov-lcov', '~> 0.8.0', require: false gem 'capybara', '~> 3.18' gem 'timecop', '~> 0.9.1' gem 'webmock', '~> 3.8' # , '>= 3.6.2' diff --git a/Gemfile.lock b/Gemfile.lock index 26770b0186..4b33bfa85d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,8 +210,6 @@ GEM closure_tree (7.4.0) activerecord (>= 4.2.10) with_advisory_lock (>= 4.0.0) - codecov (0.6.0) - simplecov (>= 0.15, < 0.22) coderay (1.1.3) colrapi (0.1.1) faraday (~> 2.2) @@ -640,11 +638,12 @@ GEM shellany (0.0.1) shortener (1.0.0) voight_kampff (~> 1.1.2) - simplecov (0.21.2) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) spreadsheet (1.3.1) bigdecimal @@ -769,7 +768,6 @@ DEPENDENCIES chunky_png (~> 1.4.0) citeproc-ruby (~> 2.0) closure_tree (~> 7.0) - codecov (~> 0.6.0) colrapi (~> 0.1.1) csl (~> 2.0) csl-styles (~> 2.0.1) @@ -857,6 +855,7 @@ DEPENDENCIES shakapacker (= 8.0.0) shortener (~> 1.0) simplecov + simplecov-lcov (~> 0.8.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 4.2) sprockets-es6 (~> 0.9.2) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index d0bb5d7007..5d0d6e4505 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -1,10 +1,18 @@ if !ENV['NO_COVERAGE_REPORT'] && ENV['CI'] require 'simplecov' - SimpleCov.start - require 'codecov' - SimpleCov.formatter = SimpleCov::Formatter::Codecov - Codecov.pass_ci_if_error = true + SimpleCov.start 'rails' do + require 'simplecov-lcov' + + SimpleCov::Formatter::LcovFormatter.config do |c| + c.report_with_single_file = true + c.single_report_path = 'coverage/lcov.info' + end + + formatter SimpleCov::Formatter::LcovFormatter + + add_filter %w[version.rb initializer.rb] + end end ENV['RAILS_ENV'] ||= 'test'