From e410dc15467e77de17610aef88f50de5147a335b Mon Sep 17 00:00:00 2001 From: winebarrel Date: Mon, 4 Jan 2021 00:55:42 +0900 Subject: [PATCH] Fix Coveralls setting: update for Github Actions --- .github/workflows/test.yml | 8 +++++++- .simplecov | 6 ++++++ ridgepole.gemspec | 3 ++- spec/processing_for_ci.rb | 13 +++++++++++++ spec/processing_for_travis.rb | 11 ----------- spec/spec_helper.rb | 2 +- 6 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 .simplecov create mode 100644 spec/processing_for_ci.rb delete mode 100644 spec/processing_for_travis.rb diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aa1043c1..a974f8ef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -60,6 +60,12 @@ jobs: env: BUNDLE_GEMFILE: ${{ matrix.gemfile }} - - run: ${{ matrix.env }} bundle exec rake + - name: Run tests + run: ${{ matrix.env }} bundle exec rake env: BUNDLE_GEMFILE: ${{ matrix.gemfile }} + + - name: Coveralls GitHub Action + uses: coverallsapp/github-action@v1.1.2 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.simplecov b/.simplecov new file mode 100644 index 00000000..c350579a --- /dev/null +++ b/.simplecov @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +SimpleCov.start do + # exclude directories and files + add_filter '/spec/' +end diff --git a/ridgepole.gemspec b/ridgepole.gemspec index f87b37ae..239b1952 100644 --- a/ridgepole.gemspec +++ b/ridgepole.gemspec @@ -26,7 +26,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'appraisal', '>= 2.2.0' spec.add_development_dependency 'bundler' - spec.add_development_dependency 'coveralls' spec.add_development_dependency 'erbh', '>= 0.1.2' spec.add_development_dependency 'hash_modern_inspect', '>= 0.1.1' spec.add_development_dependency 'hash_order_helper', '>= 0.1.6' @@ -39,4 +38,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rubocop', '>= 1.7.0' spec.add_development_dependency 'rubocop-rake', '>= 0.5.1' spec.add_development_dependency 'rubocop-rspec', '>= 2.1.0' + spec.add_development_dependency 'simplecov' + spec.add_development_dependency 'simplecov-lcov' end diff --git a/spec/processing_for_ci.rb b/spec/processing_for_ci.rb new file mode 100644 index 00000000..e5c580f8 --- /dev/null +++ b/spec/processing_for_ci.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +if ENV['CI'] + require 'simplecov' + require 'simplecov-lcov' + + SimpleCov::Formatter::LcovFormatter.config do |c| + c.report_with_single_file = true + c.single_report_path = 'coverage/lcov.info' + end + SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new([SimpleCov::Formatter::LcovFormatter]) + SimpleCov.start +end diff --git a/spec/processing_for_travis.rb b/spec/processing_for_travis.rb deleted file mode 100644 index b3cae517..00000000 --- a/spec/processing_for_travis.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -if ENV['TRAVIS'] - require 'simplecov' - require 'coveralls' - - SimpleCov.formatter = Coveralls::SimpleCov::Formatter - SimpleCov.start do - add_filter 'spec/' - end -end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index dab38f9d..df2f80ca 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -7,7 +7,7 @@ require 'cli_helper' require 'hide_pending_formatter' -require 'processing_for_travis' +require 'processing_for_ci' require 'ridgepole' require 'ridgepole/cli/config'