Skip to content

Commit

Permalink
Merge pull request #337 from winebarrel/fix_for_coveralls
Browse files Browse the repository at this point in the history
Fix Coveralls setting: update for Github Actions
  • Loading branch information
winebarrel committed Jan 3, 2021
2 parents b2e2c12 + e410dc1 commit 6d0b656
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 14 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/test.yml
Expand Up @@ -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 }}
6 changes: 6 additions & 0 deletions .simplecov
@@ -0,0 +1,6 @@
# frozen_string_literal: true

SimpleCov.start do
# exclude directories and files
add_filter '/spec/'
end
3 changes: 2 additions & 1 deletion ridgepole.gemspec
Expand Up @@ -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'
Expand All @@ -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
13 changes: 13 additions & 0 deletions 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
11 changes: 0 additions & 11 deletions spec/processing_for_travis.rb

This file was deleted.

2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Expand Up @@ -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'
Expand Down

0 comments on commit 6d0b656

Please sign in to comment.